Skip to content

Commit

Permalink
added chat list and account view, updated login page
Browse files Browse the repository at this point in the history
  • Loading branch information
cherryymerryy committed Jul 30, 2024
1 parent a38022e commit 47ded23
Show file tree
Hide file tree
Showing 17 changed files with 426 additions and 213 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -360,4 +360,6 @@ MigrationBackup/
.ionide/

# Fody - auto-generated XML schema
FodyWeavers.xsd
FodyWeavers.xsd
/.idea
/Config/*
15 changes: 15 additions & 0 deletions App.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
<section name="CherryMerryGram.cherrymerrygram_config" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup>
</configSections>
<userSettings>
<CherryMerryGram.cherrymerrygram_config>
<setting name="appId" serializeAs="String">
<value />
</setting>
</CherryMerryGram.cherrymerrygram_config>
</userSettings>
</configuration>
14 changes: 13 additions & 1 deletion CherryMerryGram.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
Expand All @@ -16,7 +16,9 @@
<ItemGroup>
<None Remove="Views\AccountView.xaml" />
<None Remove="Views\ChatsView.xaml" />
<None Remove="Views\Chats\ChatEntry.xaml" />
<None Remove="Views\HelpView.xaml" />
<None Remove="Views\LoginView.xaml" />
<None Remove="Views\SettingsView.xaml" />
</ItemGroup>

Expand Down Expand Up @@ -46,6 +48,11 @@
<ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
<ProjectCapability Include="Msix" />
</ItemGroup>
<ItemGroup>
<Page Update="Views\LoginView.xaml">
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<ItemGroup>
<Page Update="Views\HelpView.xaml">
<Generator>MSBuild:Compile</Generator>
Expand All @@ -66,6 +73,11 @@
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<ItemGroup>
<Page Update="Views\Chats\ChatEntry.xaml">
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>

<!--
Defining the "HasPackageAndPublishMenuAddedByProject" property here allows the Solution
Expand Down
22 changes: 12 additions & 10 deletions MainWindow.xaml
Original file line number Diff line number Diff line change
@@ -1,28 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<Window
x:Class="CherryMerryGram.MainWindow"
x:Name="CherryMerryGram"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="using:CherryMerryGram"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d">


<NavigationView x:Name="NavView"
Header="This is Header Text"
PaneDisplayMode="Left"
SelectionChanged="NavigationView_SelectionChanged9"
IsSettingsVisible="False">
IsSettingsVisible="False"
ItemInvoked="NavView_ItemInvoked"
Loaded="NavView_Loaded"
SelectionChanged="NavView_SelectionChanged">
<NavigationView.MenuItems>
<NavigationViewItem Content="Login" Tag="LoginView" Icon="Home" IsEnabled="False"/>
<NavigationViewItem Content="All chats" Tag="ChatsView" Icon="People" />
<ListView x:Name="TestListView"/>
<NavigationViewItem x:Name="NavView_Login" Content="Login" Tag="LoginView" Icon="Home"/>
<NavigationViewItem x:Name="NavView_Chats" Content="All chats" Tag="ChatsView" Icon="People" />
</NavigationView.MenuItems>
<NavigationView.FooterMenuItems>
<NavigationViewItem Content="Account" Tag="AccountView" Icon="Contact" />
<NavigationViewItem Content="Settings" Tag="SettingsView" Icon="Setting" />
<NavigationViewItem Content="Help" Tag="HelpView" Icon="Help" />
<NavigationViewItem x:Name="NavView_Account" Content="Account" Tag="AccountView" Icon="Contact" />
<NavigationViewItem x:Name="NavView_Settings" Content="Settings" Tag="SettingsView" Icon="Setting" />
<NavigationViewItem x:Name="NavView_Help" Content="Help" Tag="HelpView" Icon="Help" />
</NavigationView.FooterMenuItems>
<Frame x:Name="ContentFrame" />
<Frame x:Name="ContentFrame" NavigationFailed="ContentFrame_NavigationFailed"/>
</NavigationView>
</Window>
Loading

0 comments on commit 47ded23

Please sign in to comment.