name change surgery

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 KawaiiZenbo
+Copyright (c) 2022-2024 KawaiiZenbo
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

UniversalFedi.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.28307.2092
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WMstodon", "WMstodon\WMstodon.csproj", "{F55E4C40-A65B-4B63-A753-C58546D7829B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniversalFedi", "UniversalFedi\UniversalFedi.csproj", "{F55E4C40-A65B-4B63-A753-C58546D7829B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

UniversalFedi/App.xaml

@@ -1,5 +1,5 @@
 <Application
-    x:Class="WMstodon.App"
+    x:Class="UniversalFedi.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:WMstodon">

UniversalFedi/App.xaml.cs

@@ -15,7 +15,7 @@ using Windows.UI.Xaml.Input;
 using Windows.UI.Xaml.Media;
 using Windows.UI.Xaml.Navigation;
 
-namespace WMstodon
+namespace UniversalFedi
 {
     /// <summary>
     /// Provides application-specific behavior to supplement the default Application class.

UniversalFedi/HTTPUtils.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 using Windows.Storage;
 
-namespace WMstodon
+namespace UniversalFedi
 {
     class HTTPUtils
     {

UniversalFedi/ImageViewerPage.xaml

@@ -1,5 +1,5 @@
 <Page
-    x:Class="WMstodon.ImageViewerPage"
+    x:Class="UniversalFedi.ImageViewerPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:WMstodon"

UniversalFedi/ImageViewerPage.xaml.cs

@@ -7,7 +7,7 @@ using Windows.UI.Xaml.Navigation;
 
 // The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
 
-namespace WMstodon
+namespace UniversalFedi
 {
     /// <summary>
     /// An empty page that can be used on its own or navigated to within a Frame.

UniversalFedi/JSONClasses.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace WMstodon
+namespace UniversalFedi
 {
     public class Account
     {

UniversalFedi/LoginPage.xaml

@@ -1,5 +1,5 @@
 <Page
-    x:Class="WMstodon.LoginPage"
+    x:Class="UniversalFedi.LoginPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:WMstodon"

UniversalFedi/LoginPage.xaml.cs

@@ -10,7 +10,7 @@ using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Navigation;
 
-namespace WMstodon
+namespace UniversalFedi
 {
     public sealed partial class LoginPage : Page
     {

UniversalFedi/MainPage.xaml

@@ -1,5 +1,5 @@
 <Page
-    x:Class="WMstodon.MainPage"
+    x:Class="UniversalFedi.MainPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:WMstodon"
@@ -14,13 +14,13 @@
                 <TextBlock Text="Home Timeline" Margin="12,14"/>
             </CommandBar.Content>
             
-            <AppBarButton Icon="Add" Label="New Post" Click="NewPostButton_Click"/>
+            <AppBarButton Icon="Add" Label="New Post" Click="NewPostButton_Click" FontFamily="Segoe UI" VerticalAlignment="Stretch" HorizontalAlignment="Center" Margin="0,4,0,0"/>
-            <AppBarButton Icon="Refresh" Label="Refresh" Click="RefreshButton_Click"/>
+            <AppBarButton Icon="Refresh" Label="Refresh" Click="RefreshButton_Click" HorizontalAlignment="Center" VerticalAlignment="Stretch" Margin="0,4,0,0"/>
 
             <CommandBar.SecondaryCommands>
-                <AppBarButton Label="&#xE80F; Home Timeline" FontFamily="Segoe MDL2 Assets"/>
+                <AppBarButton Label="&#xE80F; Home Timeline" FontFamily="Segoe MDL2 Assets" Click="HomeTimelineButton_Click"/>
-                <AppBarButton Label="&#xE716; Local Timeline" FontFamily="Segoe MDL2 Assets"/>
+                <AppBarButton Label="&#xE716; Local Timeline" FontFamily="Segoe MDL2 Assets" Click="LocalTimelineButton_Click"/>
-                <AppBarButton Label="&#xE774; Federated Timeline" FontFamily="Segoe MDL2 Assets"/>
+                <AppBarButton Label="&#xE774; Federated Timeline" FontFamily="Segoe MDL2 Assets" Click="FederatedTimelineButton_Click"/>
                 <AppBarButton Label="&#xE77B; My Account" FontFamily="Segoe MDL2 Assets"/>
                 <AppBarButton Label="&#xF3B1; Log Out" Click="LogOutButton_Click" FontFamily="Segoe MDL2 Assets"/>
             </CommandBar.SecondaryCommands>

UniversalFedi/MainPage.xaml.cs

@@ -11,7 +11,7 @@ using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Media.Imaging;
 using Windows.UI.Xaml.Navigation;
 
-namespace WMstodon
+namespace UniversalFedi
 {
     public sealed partial class MainPage : Page
     {
@@ -34,9 +34,7 @@ namespace WMstodon
             }
             catch
             {
-                localSettings.Values["instanceURL"] = null;
+                Reset();
-                localSettings.Values["accessToken"] = null;
-                Frame.Navigate(typeof(SelectInstancePage), null);
                 return;
             }
 
@@ -52,9 +50,7 @@ namespace WMstodon
             }
             catch
             {
-                localSettings.Values["instanceURL"] = null;
+                Reset();
-                localSettings.Values["accessToken"] = null;
-                Frame.Navigate(typeof(SelectInstancePage), null);
                 return;
             }
             AvatarImage.Source = bitmap;
@@ -64,7 +60,7 @@ namespace WMstodon
 
         private async Task LoadFeed()
         {
-            string feedJSON = ($"{{\"statuses\": {(await HTTPUtils.GETAsync("/api/v1/timelines/home")).Content.ReadAsStringAsync().Result}}}");
+            string feedJSON = ($"{{\"statuses\": {(await HTTPUtils.GETAsync($"/api/v1/timelines/{localSettings.Values["timelineMode"]}")).Content.ReadAsStringAsync().Result}}}");
             Feed feed = new Feed();
             feed = JsonConvert.DeserializeObject<Feed>(feedJSON);
             foreach (Status s in feed.statuses)
@@ -106,9 +102,7 @@ namespace WMstodon
 
             if (result == ContentDialogResult.Primary)
             {
-                localSettings.Values["instanceURL"] = null;
+                Reset();
-                localSettings.Values["accessToken"] = null;
-                Frame.Navigate(typeof(SelectInstancePage), null);
             }
         }
 
@@ -127,5 +121,31 @@ namespace WMstodon
         {
             Frame.Navigate(typeof(NewStatusPage), null);
         }
+
+        private void Reset()
+        {
+            localSettings.Values["instanceURL"] = null;
+            localSettings.Values["accessToken"] = null;
+            localSettings.Values["timelineMode"] = "home";
+            Frame.Navigate(typeof(SelectInstancePage), null);
+        }
+
+        private void HomeTimelineButton_Click(object sender, RoutedEventArgs e)
+        {
+            localSettings.Values["timelineMode"] = "home";
+            Frame.Navigate(typeof(MainPage), null);
+        }
+
+        private void LocalTimelineButton_Click(object sender, RoutedEventArgs e)
+        {
+            localSettings.Values["timelineMode"] = "public?local=true";
+            Frame.Navigate(typeof(MainPage), null);
+        }
+
+        private void FederatedTimelineButton_Click(object sender, RoutedEventArgs e)
+        {
+            localSettings.Values["timelineMode"] = "public";
+            Frame.Navigate(typeof(MainPage), null);
+        }
     }
 }

UniversalFedi/NewStatusPage.xaml

@@ -1,5 +1,5 @@
 <Page
-    x:Class="WMstodon.NewStatusPage"
+    x:Class="UniversalFedi.NewStatusPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:WMstodon"

UniversalFedi/NewStatusPage.xaml.cs

@@ -13,7 +13,7 @@ using Windows.UI.Xaml.Input;
 using Windows.UI.Xaml.Media;
 using Windows.UI.Xaml.Navigation;
 
-namespace WMstodon
+namespace UniversalFedi
 {
     public sealed partial class NewStatusPage : Page
     {

UniversalFedi/Package.appxmanifest

@@ -14,8 +14,9 @@
     <Resource Language="x-generate" />
   </Resources>
   <Applications>
-    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="WMstodon.App">
+    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="UniversalFedi.App">
-      <uap:VisualElements DisplayName="WMstodon" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="WMstodon" BackgroundColor="transparent">
+      <uap:VisualElements DisplayName="UniversalFedi" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="UniversalFedi" BackgroundColor="transparent">
+        <uap:LockScreen Notification="badgeAndTileText" BadgeLogo="Assets\BadgeLogo.png" />
         <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" Square310x310Logo="Assets\LargeTile.png" Square71x71Logo="Assets\SmallTile.png">
         </uap:DefaultTile>
         <uap:SplashScreen Image="Assets\SplashScreen.png" />

UniversalFedi/Properties/AssemblyInfo.cs

@@ -5,12 +5,12 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("WMstodon")]
+[assembly: AssemblyTitle("UniversalFedi")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("WMstodon")]
+[assembly: AssemblyProduct("UniversalFedi")]
-[assembly: AssemblyCopyright("Copyright ©  2022")]
+[assembly: AssemblyCopyright("Copyright © KawaiiZenbo 2022-2024\nThis program is under the MIT License.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

UniversalFedi/SelectInstancePage.xaml

@@ -1,5 +1,5 @@
 <Page
-    x:Class="WMstodon.SelectInstancePage"
+    x:Class="UniversalFedi.SelectInstancePage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:WMstodon"

UniversalFedi/SelectInstancePage.xaml.cs

@@ -11,7 +11,7 @@ using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Navigation;
 
-namespace WMstodon
+namespace UniversalFedi
 {
     public sealed partial class SelectInstancePage : Page
     {

UniversalFedi/StatusPage.xaml

@@ -1,5 +1,5 @@
 <Page
-    x:Class="WMstodon.StatusPage"
+    x:Class="UniversalFedi.StatusPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:WMstodon"

UniversalFedi/StatusPage.xaml.cs

@@ -12,7 +12,7 @@ using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Media.Imaging;
 using Windows.UI.Xaml.Navigation;
 
-namespace WMstodon
+namespace UniversalFedi
 {
     public sealed partial class StatusPage : Page
     {

UniversalFedi/UniversalFedi.csproj

@@ -7,8 +7,8 @@
     <ProjectGuid>{F55E4C40-A65B-4B63-A753-C58546D7829B}</ProjectGuid>
     <OutputType>AppContainerExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>WMstodon</RootNamespace>
+    <RootNamespace>UniversalFedi</RootNamespace>
-    <AssemblyName>WMstodon</AssemblyName>
+    <AssemblyName>UniversalFedi</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
     <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
@@ -17,7 +17,7 @@
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
-    <PackageCertificateKeyFile>WMstodon_TemporaryKey.pfx</PackageCertificateKeyFile>
+    <PackageCertificateKeyFile>UniversalFedi_TemporaryKey.pfx</PackageCertificateKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -145,7 +145,7 @@
     <AppxManifest Include="Package.appxmanifest">
       <SubType>Designer</SubType>
     </AppxManifest>
-    <None Include="WMstodon_TemporaryKey.pfx" />
+    <None Include="UniversalFedi_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Assets\LargeTile.scale-100.png" />