add instagram redesign

README-zh_CN.md

@@ -155,7 +155,19 @@ ECharts：[pie-doughnut](https://echarts.apache.org/examples/zh/editor.html?c=pi
 
 <p align="center">菜单切换用户控件</p>
 
-5. 简易音乐播放器1
+5. Instagram重新设计
+
+参考视频：[C# WPF Material Design UI: Redesign Instagram](https://www.youtube.com/watch?v=X-FcXgDnglA&t=39s)
+
+参考源码：[Instagram](https://github.com/Abel13/Instagram)
+
+<p align="center">
+  <img src="./assets/TestDemos/InstagramRedesign.gif">
+</p>
+
+<p align="center">Instagram重新设计</p>
+
+6. 简易音乐播放器1
 
 参考视频：[C# WPF Material Design UI: Dashboard](https://www.youtube.com/watch?v=sgEhK3mbDYo&t=26s)
 

README.md

@@ -155,7 +155,19 @@ Reference source code:[AnimatedMenu1](https://github.com/Abel13/AnimatedMenu1)
 
 <p align="center">Animated menu</p>
 
-5. Easy music player 1
+5. Instagram redesign
+
+Reference video:[C# WPF Material Design UI: Redesign Instagram](https://www.youtube.com/watch?v=X-FcXgDnglA&t=39s)
+
+Reference source code:[Instagram](https://github.com/Abel13/Instagram)
+
+<p align="center">
+  <img src="./assets/TestDemos/InstagramRedesign.gif">
+</p>
+
+<p align="center">Instagram redesign</p>
+
+6. Easy music player 1
 
 Reference video:[C# WPF Material Design UI: Dashboard](https://www.youtube.com/watch?v=sgEhK3mbDYo&t=26s)
 

src/TerminalMACS.Home/TerminalMACS.Home.csproj

@@ -17,6 +17,7 @@
     <PackageReference Include="HandyControl" Version="2.5.0.2" />
     <PackageReference Include="MaterialDesignColors" Version="1.2.6" />
     <PackageReference Include="MaterialDesignThemes" Version="3.2.0-ci1494" />
+    <PackageReference Include="Panuon.UI.Silver" Version="2.0.0.8-alpha" />
     <PackageReference Include="Prism.Wpf" Version="8.0.0.1740-pre" />
   </ItemGroup>
   <ItemGroup>

src/TerminalMACS.Home/Views/ChildTabItem/TestDemoDisplay.xaml.cs

 using System;
 using System.Windows.Controls;
 using System.Linq;
+using System.Threading;
 
 namespace TerminalMACS.Home.Views.ChildTabItem
 {
@@ -12,6 +13,7 @@ namespace TerminalMACS.Home.Views.ChildTabItem
         public TestDemoDisplay()
         {
             InitializeComponent();
+
             var imgs = System.IO.Directory.GetFiles("./../../../assets/TestDemos");
             if (imgs.Length > 0)
             {
@@ -21,7 +23,7 @@ namespace TerminalMACS.Home.Views.ChildTabItem
                     CoverFlowMain.Add(new Uri(fullPath, UriKind.RelativeOrAbsolute));
                 }
             }
-            //CoverFlowMain.JumpTo(2);
+            CoverFlowMain.JumpTo(2);
         }
     }
 }

src/TerminalMACS.TestDemo/I18nResources/Language.cs

@@ -28,6 +28,7 @@ namespace TerminalMACS.TestDemo.I18nResources
 		public static readonly ComponentResourceKey MainTabItem_Dashboard2BtnContent = new ComponentResourceKey(typeof(UiResource), nameof(MainTabItem_Dashboard2BtnContent));
 		public static readonly ComponentResourceKey MainTabItem_FoodBtnContent = new ComponentResourceKey(typeof(UiResource), nameof(MainTabItem_FoodBtnContent));
 		public static readonly ComponentResourceKey MainTabItem_Header = new ComponentResourceKey(typeof(UiResource), nameof(MainTabItem_Header));
+		public static readonly ComponentResourceKey MainTabItem_InstagramRedesignBtnContent = new ComponentResourceKey(typeof(UiResource), nameof(MainTabItem_InstagramRedesignBtnContent));
 		public static readonly ComponentResourceKey MainTabItem_LoginView1BtnContent = new ComponentResourceKey(typeof(UiResource), nameof(MainTabItem_LoginView1BtnContent));
 		public static readonly ComponentResourceKey MainTabItem_LoginView2BtnContent = new ComponentResourceKey(typeof(UiResource), nameof(MainTabItem_LoginView2BtnContent));
 		public static readonly ComponentResourceKey MainTabItem_MenuChangeBtnContent = new ComponentResourceKey(typeof(UiResource), nameof(MainTabItem_MenuChangeBtnContent));

src/TerminalMACS.TestDemo/I18nResources/UiResource.Designer.cs

@@ -186,6 +186,15 @@ namespace TerminalMACS.TestDemo.I18nResources {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Instagram redesign 的本地化字符串。
+        /// </summary>
+        internal static string MainTabItem_InstagramRedesignBtnContent {
+            get {
+                return ResourceManager.GetString("MainTabItem_InstagramRedesignBtnContent", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Simple login form 1 的本地化字符串。
         /// </summary>

src/TerminalMACS.TestDemo/I18nResources/UiResource.ja.resx

@@ -159,6 +159,9 @@
   <data name="MainTabItem_Header" xml:space="preserve">
     <value>テストケース</value>
   </data>
+  <data name="MainTabItem_InstagramRedesignBtnContent" xml:space="preserve">
+    <value>Instagramの再設計</value>
+  </data>
   <data name="MainTabItem_LoginView1BtnContent" xml:space="preserve">
     <value>フォーム1を簡単に登録する</value>
   </data>

src/TerminalMACS.TestDemo/I18nResources/UiResource.resx

@@ -159,6 +159,9 @@
   <data name="MainTabItem_Header" xml:space="preserve">
     <value>Test demos</value>
   </data>
+  <data name="MainTabItem_InstagramRedesignBtnContent" xml:space="preserve">
+    <value>Instagram redesign</value>
+  </data>
   <data name="MainTabItem_LoginView1BtnContent" xml:space="preserve">
     <value>Simple login form 1</value>
   </data>

src/TerminalMACS.TestDemo/I18nResources/UiResource.zh-CN.resx

@@ -159,6 +159,9 @@
   <data name="MainTabItem_Header" xml:space="preserve">
     <value>测试案例</value>
   </data>
+  <data name="MainTabItem_InstagramRedesignBtnContent" xml:space="preserve">
+    <value>Instagram重新设计</value>
+  </data>
   <data name="MainTabItem_LoginView1BtnContent" xml:space="preserve">
     <value>简单登录窗体1</value>
   </data>

src/TerminalMACS.TestDemo/TerminalMACS.TestDemo.csproj

@@ -16,6 +16,18 @@
     <None Remove="Images\bg.jpg" />
     <None Remove="Images\bg.png" />
     <None Remove="Views\FoodAppLoginUI\Images\food.jpg" />
+    <None Remove="Views\InstagramRedesign\Assets\food-salad-restaurant-person.jpg" />
+    <None Remove="Views\InstagramRedesign\Assets\insta.jpg" />
+    <None Remove="Views\InstagramRedesign\Assets\pexels-photo-192439.jpeg" />
+    <None Remove="Views\InstagramRedesign\Assets\pexels-photo-257360.jpeg" />
+    <None Remove="Views\InstagramRedesign\Assets\pexels-photo-288583.jpeg" />
+    <None Remove="Views\InstagramRedesign\Assets\pexels-photo-301290.jpeg" />
+    <None Remove="Views\InstagramRedesign\Assets\pexels-photo-614810.jpeg" />
+    <None Remove="Views\InstagramRedesign\Assets\pexels-photo-638791.jpeg" />
+    <None Remove="Views\InstagramRedesign\Assets\pexels-photo-790164.jpeg" />
+    <None Remove="Views\InstagramRedesign\Assets\pexels-photo-792778.jpeg" />
+    <None Remove="Views\InstagramRedesign\Assets\pexels-photo-797640.jpeg" />
+    <None Remove="Views\InstagramRedesign\Assets\profile.jpeg" />
     <None Remove="Views\MobileAppUsageDashboardCore\pie-doughnut.html" />
   </ItemGroup>
   <ItemGroup>
@@ -39,6 +51,18 @@
   <ItemGroup>
     <Resource Include="Images\bg.png" />
     <Resource Include="Views\FoodAppLoginUI\Images\food.jpg" />
+    <Resource Include="Views\InstagramRedesign\Assets\food-salad-restaurant-person.jpg" />
+    <Resource Include="Views\InstagramRedesign\Assets\insta.jpg" />
+    <Resource Include="Views\InstagramRedesign\Assets\pexels-photo-192439.jpeg" />
+    <Resource Include="Views\InstagramRedesign\Assets\pexels-photo-257360.jpeg" />
+    <Resource Include="Views\InstagramRedesign\Assets\pexels-photo-288583.jpeg" />
+    <Resource Include="Views\InstagramRedesign\Assets\pexels-photo-301290.jpeg" />
+    <Resource Include="Views\InstagramRedesign\Assets\pexels-photo-614810.jpeg" />
+    <Resource Include="Views\InstagramRedesign\Assets\pexels-photo-638791.jpeg" />
+    <Resource Include="Views\InstagramRedesign\Assets\pexels-photo-790164.jpeg" />
+    <Resource Include="Views\InstagramRedesign\Assets\pexels-photo-792778.jpeg" />
+    <Resource Include="Views\InstagramRedesign\Assets\pexels-photo-797640.jpeg" />
+    <Resource Include="Views\InstagramRedesign\Assets\profile.jpeg" />
     <Resource Include="Views\MobileAppUsageDashboardCore\pie-doughnut.html">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>

src/TerminalMACS.TestDemo/Views/InstagramRedesign/InstagramRedesignView.xaml

+<Window x:Class="TerminalMACS.TestDemo.Views.InstagramRedesign.InstagramRedesignView"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+        MouseLeftButtonDown="MoveWindow_MouseLeftButtonDown"
+        mc:Ignorable="d" Height="600" Width="1080" ResizeMode="NoResize"
+        WindowStartupLocation="CenterScreen" WindowStyle="None">
+    <Window.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Dark.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.Blue.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Indigo.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Window.Resources>
+    <Grid Background="#FF44325F">
+        <Grid Height="100" VerticalAlignment="Top" Background="White">
+            <Image Source="Assets/insta.jpg" HorizontalAlignment="Left" Margin="10 0"/>
+            <TextBlock Text="Sunshine mixed with a little Hurricane✨" Margin="10" FontSize="14" Foreground="#FF2A6088" HorizontalAlignment="Center"/>
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                <StackPanel VerticalAlignment="Bottom">
+                    <TextBlock Text="追随者" Margin="10 0" FontSize="16" FontWeight="Bold" Foreground="#FF2A6088" />
+                    <TextBlock Text="2K" HorizontalAlignment="Center" Margin="5 0 5 5" FontSize="16" Foreground="#FF2A6088"/>
+                </StackPanel>
+                <StackPanel VerticalAlignment="Bottom">
+                    <TextBlock Text="跟随" Margin="10 0" FontSize="16" FontWeight="Bold" Foreground="#FF2A6088"/>
+                    <TextBlock Text="957" HorizontalAlignment="Center" Margin="5 0 5 5" FontSize="16" Foreground="#FF2A6088"/>
+                </StackPanel>
+                <StackPanel VerticalAlignment="Bottom">
+                    <TextBlock Text="帖子" Margin="10 0" FontSize="16" FontWeight="Bold" Foreground="#FF2A6088"/>
+                    <TextBlock Text="145" HorizontalAlignment="Center" Margin="5 0 5 5" FontSize="16" Foreground="#FF2A6088"/>
+                </StackPanel>
+            </StackPanel>
+        </Grid>
+        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="20" >
+            <TextBlock FontFamily="Nirmala UI" Text="Dotnet9.com" FontSize="30" Margin="20" VerticalAlignment="Center" Foreground="White"/>
+            <StackPanel HorizontalAlignment="Right">
+                <Ellipse Height="150" Width="150" Stroke="White" StrokeThickness="3">
+                    <Ellipse.Fill>
+                        <ImageBrush ImageSource="https://img.dotnet9.com/logo.png" Stretch="UniformToFill"/>
+                    </Ellipse.Fill>
+                </Ellipse>
+                <Button HorizontalAlignment="Center" Margin="10" Content="编辑个人信息" Background="{x:Null}" BorderBrush="White"/>
+            </StackPanel>
+        </StackPanel>
+        <StackPanel Orientation="Horizontal" VerticalAlignment="Top" Margin="10 110">
+            <TextBox Width="150" materialDesign:HintAssist.Hint="搜索" Foreground="White"/>
+            <materialDesign:PackIcon Kind="AccountSearch" Foreground="White" VerticalAlignment="Center"/>
+        </StackPanel>
+        <ListView HorizontalAlignment="Right" Margin="0 220 0 0">
+            <ListViewItem Height="50" Width="260">
+                <Grid Height="30" Width="250">
+                    <Ellipse Width="30" Height="30" StrokeThickness="0.5" Stroke="White" HorizontalAlignment="Left">
+                        <Ellipse.Fill>
+                            <ImageBrush ImageSource="Assets/pexels-photo-192439.jpeg" Stretch="UniformToFill"/>
+                        </Ellipse.Fill>
+                    </Ellipse>
+                    <TextBlock Width="150" HorizontalAlignment="Left"  Margin="35 0" Text="Your friend John is on instagram as John_J" FontSize="10" TextWrapping="Wrap"/>
+                    <Button HorizontalAlignment="Right" Content="跟随" FontSize="10" Margin="10 0" Height="20" Padding="10 0"/>
+                </Grid>
+            </ListViewItem>
+            <ListViewItem Height="50" Width="260">
+                <Grid Height="30" Width="250">
+                    <Ellipse Width="30" Height="30" StrokeThickness="0.5" Stroke="White" HorizontalAlignment="Left">
+                        <Ellipse.Fill>
+                            <ImageBrush ImageSource="Assets/pexels-photo-301290.jpeg" Stretch="UniformToFill"/>
+                        </Ellipse.Fill>
+                    </Ellipse>
+                    <TextBlock Width="150" HorizontalAlignment="Left"  Margin="35 0" Text="Your friend Lucy is on instagram as LLucy" FontSize="10" TextWrapping="Wrap"/>
+                    <Button HorizontalAlignment="Right" Content="跟随" FontSize="10" Margin="10 0" Height="20" Padding="10 0"/>
+                </Grid>
+            </ListViewItem>
+            <ListViewItem Height="50" Width="260">
+                <Grid Height="30" Width="250">
+                    <Ellipse Width="30" Height="30" StrokeThickness="0.5" Stroke="White" HorizontalAlignment="Left">
+                        <Ellipse.Fill>
+                            <ImageBrush ImageSource="Assets/pexels-photo-614810.jpeg" Stretch="UniformToFill"/>
+                        </Ellipse.Fill>
+                    </Ellipse>
+                    <TextBlock Width="150" HorizontalAlignment="Left"  Margin="35 0" Text="Your friend _b_b_jax is on instagram as bbjax" FontSize="10" TextWrapping="Wrap"/>
+                    <Button HorizontalAlignment="Right" Content="跟随" FontSize="10" Margin="10 0" Height="20" Padding="10 0"/>
+                </Grid>
+            </ListViewItem>
+            <ListViewItem Height="50" Width="260">
+                <Grid Height="30" Width="250">
+                    <Ellipse Width="30" Height="30" StrokeThickness="0.5" Stroke="White" HorizontalAlignment="Left">
+                        <Ellipse.Fill>
+                            <ImageBrush ImageSource="Assets/pexels-photo-638791.jpeg" Stretch="UniformToFill"/>
+                        </Ellipse.Fill>
+                    </Ellipse>
+                    <TextBlock Width="150" HorizontalAlignment="Left"  Margin="35 0" Text="Your friend Carl is on instagram as CJ" FontSize="10" TextWrapping="Wrap"/>
+                    <Button HorizontalAlignment="Right" Content="跟随" FontSize="10" Margin="10 0" Height="20" Padding="10 0"/>
+                </Grid>
+            </ListViewItem>
+        </ListView>
+        <StackPanel Margin="0 150 300 0">
+            <StackPanel Orientation="Horizontal" Margin="10">
+                <Ellipse Height="70" Width="70" Margin="10" Stroke="White" StrokeThickness="3">
+                    <Ellipse.Fill>
+                        <ImageBrush ImageSource="Assets/pexels-photo-192439.jpeg" Stretch="UniformToFill"/>
+                    </Ellipse.Fill>
+                </Ellipse>
+                <Ellipse Height="70" Width="70" Margin="10" Stroke="White" StrokeThickness="3">
+                    <Ellipse.Fill>
+                        <ImageBrush ImageSource="Assets/pexels-photo-301290.jpeg" Stretch="UniformToFill"/>
+                    </Ellipse.Fill>
+                </Ellipse>
+                <Ellipse Height="70" Width="70" Margin="10" Stroke="White" StrokeThickness="3">
+                    <Ellipse.Fill>
+                        <ImageBrush ImageSource="Assets/pexels-photo-614810.jpeg" Stretch="UniformToFill"/>
+                    </Ellipse.Fill>
+                </Ellipse>
+                <Ellipse Height="70" Width="70" Margin="10" Stroke="White" StrokeThickness="3">
+                    <Ellipse.Fill>
+                        <ImageBrush ImageSource="Assets/pexels-photo-638791.jpeg" Stretch="UniformToFill"/>
+                    </Ellipse.Fill>
+                </Ellipse>
+            </StackPanel>
+            <ScrollViewer Height="340">
+                <StackPanel>
+                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                        <Image Width="200" Height="200" Margin="20" Source="Assets/pexels-photo-257360.jpeg" Stretch="UniformToFill"/>
+                        <Image Width="200" Height="200" Margin="20" Source="Assets/pexels-photo-288583.jpeg" Stretch="UniformToFill"/>
+                        <Image Width="200" Height="200" Margin="20" Source="Assets/pexels-photo-790164.jpeg" Stretch="UniformToFill"/>
+                    </StackPanel>
+                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                        <Image Width="200" Height="200" Margin="20" Source="Assets/food-salad-restaurant-person.jpg" Stretch="UniformToFill"/>
+                        <Image Width="200" Height="200" Margin="20" Source="Assets/pexels-photo-797640.jpeg" Stretch="UniformToFill"/>
+                        <Image Width="200" Height="200" Margin="20" Source="Assets/pexels-photo-790164.jpeg" Stretch="UniformToFill"/>
+                    </StackPanel>
+                </StackPanel>
+            </ScrollViewer>
+        </StackPanel>
+    </Grid>
+</Window>

src/TerminalMACS.TestDemo/Views/InstagramRedesign/InstagramRedesignView.xaml.cs

+using System.Windows;
+using System.Windows.Input;
+
+namespace TerminalMACS.TestDemo.Views.InstagramRedesign
+{
+    /// <summary>
+    /// InstagramRedesignView.xaml 的交互逻辑
+    /// </summary>
+    public partial class InstagramRedesignView : Window
+    {
+        public InstagramRedesignView()
+        {
+            InitializeComponent();
+        }
+        private void MoveWindow_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            DragMove();
+        }
+    }
+}

src/TerminalMACS.TestDemo/Views/MainTabItem.xaml

@@ -66,6 +66,7 @@
                     <Button Content="{markup:I18n {x:Static i18NResources:Language.MainTabItem_AnimatedMenuBtnContent}}" Click="ShowAnimatedMenu_Click"/>
                     <Button Content="{markup:I18n {x:Static i18NResources:Language.MainTabItem_AppUsageDashboardBtnContent}}" Click="ShowAppUseageDashboard_Click"/>
                     <Button Content="{markup:I18n {x:Static i18NResources:Language.MainTabItem_Dashboard2BtnContent}}" Click="ShowDashboard2_Click"/>
+                    <Button Content="{markup:I18n {x:Static i18NResources:Language.MainTabItem_InstagramRedesignBtnContent}}" Click="ShowInstagramRedesign_Click"/>
                 </StackPanel>
             </materialDesign:Card>
             <materialDesign:Card Width="400">

src/TerminalMACS.TestDemo/Views/MainTabItem.xaml.cs

 using System.Windows;
 using TerminalMACS.TestDemo.Views.AnimatedMenu;
 using TerminalMACS.TestDemo.Views.FoodAppLoginUI;
+using TerminalMACS.TestDemo.Views.InstagramRedesign;
 using TerminalMACS.TestDemo.Views.LoginUI;
 using TerminalMACS.TestDemo.Views.MenuChange;
 using TerminalMACS.TestDemo.Views.MobileAppUsageDashboardCore;
@@ -70,5 +71,12 @@ namespace TerminalMACS.TestDemo.Views
             view.Owner = Application.Current.MainWindow;
             view.Show();
         }
+
+        private void ShowInstagramRedesign_Click(object sender, RoutedEventArgs e)
+        {
+            var view = new InstagramRedesignView();
+            view.Owner = Application.Current.MainWindow;
+            view.Show();
+        }
     }
 }