Skip to content
This repository was archived by the owner on Oct 16, 2024. It is now read-only.

Commit 47ded23

Browse files
committed
added chat list and account view, updated login page
1 parent a38022e commit 47ded23

17 files changed

+426
-213
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,4 +360,6 @@ MigrationBackup/
360360
.ionide/
361361

362362
# Fody - auto-generated XML schema
363-
FodyWeavers.xsd
363+
FodyWeavers.xsd
364+
/.idea
365+
/Config/*

App.config

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<configuration>
3+
<configSections>
4+
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
5+
<section name="CherryMerryGram.cherrymerrygram_config" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
6+
</sectionGroup>
7+
</configSections>
8+
<userSettings>
9+
<CherryMerryGram.cherrymerrygram_config>
10+
<setting name="appId" serializeAs="String">
11+
<value />
12+
</setting>
13+
</CherryMerryGram.cherrymerrygram_config>
14+
</userSettings>
15+
</configuration>

CherryMerryGram.csproj

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>WinExe</OutputType>
44
<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
@@ -16,7 +16,9 @@
1616
<ItemGroup>
1717
<None Remove="Views\AccountView.xaml" />
1818
<None Remove="Views\ChatsView.xaml" />
19+
<None Remove="Views\Chats\ChatEntry.xaml" />
1920
<None Remove="Views\HelpView.xaml" />
21+
<None Remove="Views\LoginView.xaml" />
2022
<None Remove="Views\SettingsView.xaml" />
2123
</ItemGroup>
2224

@@ -46,6 +48,11 @@
4648
<ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
4749
<ProjectCapability Include="Msix" />
4850
</ItemGroup>
51+
<ItemGroup>
52+
<Page Update="Views\LoginView.xaml">
53+
<Generator>MSBuild:Compile</Generator>
54+
</Page>
55+
</ItemGroup>
4956
<ItemGroup>
5057
<Page Update="Views\HelpView.xaml">
5158
<Generator>MSBuild:Compile</Generator>
@@ -66,6 +73,11 @@
6673
<Generator>MSBuild:Compile</Generator>
6774
</Page>
6875
</ItemGroup>
76+
<ItemGroup>
77+
<Page Update="Views\Chats\ChatEntry.xaml">
78+
<Generator>MSBuild:Compile</Generator>
79+
</Page>
80+
</ItemGroup>
6981

7082
<!--
7183
Defining the "HasPackageAndPublishMenuAddedByProject" property here allows the Solution

MainWindow.xaml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,30 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Window
33
x:Class="CherryMerryGram.MainWindow"
4+
x:Name="CherryMerryGram"
45
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
56
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
67
xmlns:local="using:CherryMerryGram"
78
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
89
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
910
mc:Ignorable="d">
11+
1012

1113
<NavigationView x:Name="NavView"
12-
Header="This is Header Text"
1314
PaneDisplayMode="Left"
14-
SelectionChanged="NavigationView_SelectionChanged9"
15-
IsSettingsVisible="False">
15+
IsSettingsVisible="False"
16+
ItemInvoked="NavView_ItemInvoked"
17+
Loaded="NavView_Loaded"
18+
SelectionChanged="NavView_SelectionChanged">
1619
<NavigationView.MenuItems>
17-
<NavigationViewItem Content="Login" Tag="LoginView" Icon="Home" IsEnabled="False"/>
18-
<NavigationViewItem Content="All chats" Tag="ChatsView" Icon="People" />
19-
<ListView x:Name="TestListView"/>
20+
<NavigationViewItem x:Name="NavView_Login" Content="Login" Tag="LoginView" Icon="Home"/>
21+
<NavigationViewItem x:Name="NavView_Chats" Content="All chats" Tag="ChatsView" Icon="People" />
2022
</NavigationView.MenuItems>
2123
<NavigationView.FooterMenuItems>
22-
<NavigationViewItem Content="Account" Tag="AccountView" Icon="Contact" />
23-
<NavigationViewItem Content="Settings" Tag="SettingsView" Icon="Setting" />
24-
<NavigationViewItem Content="Help" Tag="HelpView" Icon="Help" />
24+
<NavigationViewItem x:Name="NavView_Account" Content="Account" Tag="AccountView" Icon="Contact" />
25+
<NavigationViewItem x:Name="NavView_Settings" Content="Settings" Tag="SettingsView" Icon="Setting" />
26+
<NavigationViewItem x:Name="NavView_Help" Content="Help" Tag="HelpView" Icon="Help" />
2527
</NavigationView.FooterMenuItems>
26-
<Frame x:Name="ContentFrame" />
28+
<Frame x:Name="ContentFrame" NavigationFailed="ContentFrame_NavigationFailed"/>
2729
</NavigationView>
2830
</Window>

0 commit comments

Comments
 (0)