Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/windows-universal.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--NextcloudApp/App.xaml.cs16
-rw-r--r--NextcloudApp/NextcloudApp.csproj2
-rw-r--r--NextcloudApp/PageToken.cs (renamed from NextcloudApp/PageTokens.cs)2
-rw-r--r--NextcloudApp/Services/ClientService.cs2
-rw-r--r--NextcloudApp/Services/ResponseErrorHandlerService.cs4
-rw-r--r--NextcloudApp/ViewModels/DirectoryListPageViewModel.cs14
-rw-r--r--NextcloudApp/ViewModels/FileInfoPageViewModel.cs4
-rw-r--r--NextcloudApp/ViewModels/LoginPageViewModel.cs2
-rw-r--r--NextcloudApp/ViewModels/MenuViewModel.cs36
-rw-r--r--NextcloudApp/ViewModels/SettingsPageViewModel.cs2
-rw-r--r--NextcloudApp/ViewModels/VerificationPageViewModel.cs2
11 files changed, 43 insertions, 43 deletions
diff --git a/NextcloudApp/App.xaml.cs b/NextcloudApp/App.xaml.cs
index 3a8e2a9..44a4e64 100644
--- a/NextcloudApp/App.xaml.cs
+++ b/NextcloudApp/App.xaml.cs
@@ -193,7 +193,7 @@ namespace NextcloudApp
string.IsNullOrEmpty(SettingsService.Instance.LocalSettings.Username)
)
{
- NavigationService.Navigate(PageTokens.Login.ToString(), null);
+ NavigationService.Navigate(PageToken.Login.ToString(), null);
}
else
{
@@ -226,7 +226,7 @@ namespace NextcloudApp
pageParameters = new PinStartPageParameters()
{
ResourceInfo = tmpResourceInfo,
- PageTarget = tmpResourceInfo.IsDirectory() ? PageTokens.DirectoryList.ToString() : PageTokens.FileInfo.ToString()
+ PageTarget = tmpResourceInfo.IsDirectory() ? PageToken.DirectoryList.ToString() : PageToken.FileInfo.ToString()
};
}
@@ -235,27 +235,27 @@ namespace NextcloudApp
if (SettingsService.Instance.LocalSettings.UseWindowsHello)
{
NavigationService.Navigate(
- PageTokens.Verification.ToString(),
+ PageToken.Verification.ToString(),
pageParameters?.Serialize());
}
else
{
NavigationService.Navigate(
- pageParameters!=null ? pageParameters.PageTarget : PageTokens.DirectoryList.ToString(),
+ pageParameters!=null ? pageParameters.PageTarget : PageToken.DirectoryList.ToString(),
pageParameters?.Serialize());
}
}
else
{
NavigationService.Navigate(
- PageTokens.Login.ToString(),
+ PageToken.Login.ToString(),
null);
}
}
else
{
NavigationService.Navigate(
- PageTokens.Login.ToString(),
+ PageToken.Login.ToString(),
null);
}
}
@@ -281,12 +281,12 @@ namespace NextcloudApp
{
// Nothing to do here
case ToastNotificationService.SYNCACTION:
- NavigationService.Navigate(PageTokens.DirectoryList.ToString(), null);
+ NavigationService.Navigate(PageToken.DirectoryList.ToString(), null);
break;
// Open Conflict Page
case ToastNotificationService.SYNCONFLICTACTION:
ToastNotificationManager.History.RemoveGroup(ToastNotificationService.SYNCONFLICTACTION);
- NavigationService.Navigate(PageTokens.SyncConflict.ToString(), null);
+ NavigationService.Navigate(PageToken.SyncConflict.ToString(), null);
break;
}
}
diff --git a/NextcloudApp/NextcloudApp.csproj b/NextcloudApp/NextcloudApp.csproj
index 38ceba8..88106c0 100644
--- a/NextcloudApp/NextcloudApp.csproj
+++ b/NextcloudApp/NextcloudApp.csproj
@@ -179,7 +179,7 @@
<Compile Include="Models\FileOrFolder.cs" />
<Compile Include="Models\LocalSettings.cs" />
<Compile Include="Models\PathInfo.cs" />
- <Compile Include="PageTokens.cs" />
+ <Compile Include="PageToken.cs" />
<Compile Include="Properties\Annotations.cs" />
<Compile Include="Services\LocalizationService.cs" />
<Compile Include="Services\SettingsService.cs" />
diff --git a/NextcloudApp/PageTokens.cs b/NextcloudApp/PageToken.cs
index 0515db2..47eaa34 100644
--- a/NextcloudApp/PageTokens.cs
+++ b/NextcloudApp/PageToken.cs
@@ -1,6 +1,6 @@
namespace NextcloudApp
{
- public enum PageTokens
+ public enum PageToken
{
Login,
DirectoryList,
diff --git a/NextcloudApp/Services/ClientService.cs b/NextcloudApp/Services/ClientService.cs
index e2c38e7..2d644da 100644
--- a/NextcloudApp/Services/ClientService.cs
+++ b/NextcloudApp/Services/ClientService.cs
@@ -163,7 +163,7 @@ namespace NextcloudApp.Services
};
await dialogService.ShowAsync(dialog);
SettingsService.Instance.Reset();
- navigationService.Navigate(PageTokens.Login.ToString(), null);
+ navigationService.Navigate(PageToken.Login.ToString(), null);
}
public static void Reset()
diff --git a/NextcloudApp/Services/ResponseErrorHandlerService.cs b/NextcloudApp/Services/ResponseErrorHandlerService.cs
index a774ad8..380256c 100644
--- a/NextcloudApp/Services/ResponseErrorHandlerService.cs
+++ b/NextcloudApp/Services/ResponseErrorHandlerService.cs
@@ -43,7 +43,7 @@ namespace NextcloudApp.Services
PrimaryButtonText = resourceLoader.GetString("OK")
};
await dialogService.ShowAsync(dialog);
- navigationService.Navigate(PageTokens.Login.ToString(), null);
+ navigationService.Navigate(PageToken.Login.ToString(), null);
return;
}
if (e.StatusCode == "503") // Maintenance mode
@@ -60,7 +60,7 @@ namespace NextcloudApp.Services
PrimaryButtonText = resourceLoader.GetString("OK")
};
await dialogService.ShowAsync(dialog);
- navigationService.Navigate(PageTokens.Login.ToString(), null);
+ navigationService.Navigate(PageToken.Login.ToString(), null);
app.Exit();
return;
}
diff --git a/NextcloudApp/ViewModels/DirectoryListPageViewModel.cs b/NextcloudApp/ViewModels/DirectoryListPageViewModel.cs
index 94f821c..8bdf4b1 100644
--- a/NextcloudApp/ViewModels/DirectoryListPageViewModel.cs
+++ b/NextcloudApp/ViewModels/DirectoryListPageViewModel.cs
@@ -159,7 +159,7 @@ namespace NextcloudApp.ViewModels
{
ResourceInfo = resourceInfo
};
- _navigationService.Navigate(PageTokens.FileDownload.ToString(), parameters.Serialize());
+ _navigationService.Navigate(PageToken.FileDownload.ToString(), parameters.Serialize());
}
private void DownloadSelected(object parameter)
@@ -188,7 +188,7 @@ namespace NextcloudApp.ViewModels
};
}
Directory.ToggleSelectionMode();
- _navigationService.Navigate(PageTokens.FileDownload.ToString(), parameters.Serialize());
+ _navigationService.Navigate(PageToken.FileDownload.ToString(), parameters.Serialize());
}
}
@@ -203,7 +203,7 @@ namespace NextcloudApp.ViewModels
{
ResourceInfo = resourceInfo
};
- _navigationService.Navigate(PageTokens.MoveFileOrFolder.ToString(), parameters.Serialize());
+ _navigationService.Navigate(PageToken.MoveFileOrFolder.ToString(), parameters.Serialize());
}
private async void SynchronizeFolder(object parameter)
{
@@ -363,7 +363,7 @@ namespace NextcloudApp.ViewModels
};
}
Directory.ToggleSelectionMode();
- _navigationService.Navigate(PageTokens.MoveFileOrFolder.ToString(), parameters.Serialize());
+ _navigationService.Navigate(PageToken.MoveFileOrFolder.ToString(), parameters.Serialize());
}
}
@@ -462,7 +462,7 @@ namespace NextcloudApp.ViewModels
? Directory.PathStack[Directory.PathStack.Count - 1].ResourceInfo
: new ResourceInfo()
};
- _navigationService.Navigate(PageTokens.FileUpload.ToString(), parameters.Serialize());
+ _navigationService.Navigate(PageToken.FileUpload.ToString(), parameters.Serialize());
}
private void UploadPhotos()
@@ -474,7 +474,7 @@ namespace NextcloudApp.ViewModels
: new ResourceInfo(),
PickerLocationId = PickerLocationId.PicturesLibrary
};
- _navigationService.Navigate(PageTokens.FileUpload.ToString(), parameters.Serialize());
+ _navigationService.Navigate(PageToken.FileUpload.ToString(), parameters.Serialize());
}
private async void CreateDirectory()
@@ -644,7 +644,7 @@ namespace NextcloudApp.ViewModels
{
ResourceInfo = value
};
- _navigationService.Navigate(PageTokens.FileInfo.ToString(), parameters.Serialize());
+ _navigationService.Navigate(PageToken.FileInfo.ToString(), parameters.Serialize());
}
}
}
diff --git a/NextcloudApp/ViewModels/FileInfoPageViewModel.cs b/NextcloudApp/ViewModels/FileInfoPageViewModel.cs
index a9707cf..03c5759 100644
--- a/NextcloudApp/ViewModels/FileInfoPageViewModel.cs
+++ b/NextcloudApp/ViewModels/FileInfoPageViewModel.cs
@@ -57,7 +57,7 @@ namespace NextcloudApp.ViewModels
{
ResourceInfo = ResourceInfo
};
- _navigationService.Navigate(PageTokens.FileDownload.ToString(), parameters.Serialize());
+ _navigationService.Navigate(PageToken.FileDownload.ToString(), parameters.Serialize());
});
DeleteResourceCommand = new DelegateCommand(DeleteResource);
RenameResourceCommand = new DelegateCommand(RenameResource);
@@ -319,7 +319,7 @@ namespace NextcloudApp.ViewModels
{
ResourceInfo = ResourceInfo
};
- _navigationService.Navigate(PageTokens.MoveFileOrFolder.ToString(), parameters.Serialize());
+ _navigationService.Navigate(PageToken.MoveFileOrFolder.ToString(), parameters.Serialize());
}
private void PinToStart(object parameter)
diff --git a/NextcloudApp/ViewModels/LoginPageViewModel.cs b/NextcloudApp/ViewModels/LoginPageViewModel.cs
index 9cf40e5..62ae72c 100644
--- a/NextcloudApp/ViewModels/LoginPageViewModel.cs
+++ b/NextcloudApp/ViewModels/LoginPageViewModel.cs
@@ -202,7 +202,7 @@ namespace NextcloudApp.ViewModels
var vault = new PasswordVault();
vault.Add(new PasswordCredential(ServerAddress, Username, Password));
- _navigationService.Navigate(PageTokens.DirectoryList.ToString(), null);
+ _navigationService.Navigate(PageToken.DirectoryList.ToString(), null);
}
private async Task<bool> CheckAndFixServerAddress()
diff --git a/NextcloudApp/ViewModels/MenuViewModel.cs b/NextcloudApp/ViewModels/MenuViewModel.cs
index 6acfe21..d8285da 100644
--- a/NextcloudApp/ViewModels/MenuViewModel.cs
+++ b/NextcloudApp/ViewModels/MenuViewModel.cs
@@ -21,8 +21,8 @@ namespace NextcloudApp.ViewModels
public class MenuViewModel : ViewModel
{
private const string CurrentPageTokenKey = "CurrentPageToken";
- private readonly Dictionary<PageTokens, bool> _canNavigateLookup;
- private PageTokens _currentPageToken;
+ private readonly Dictionary<PageToken, bool> _canNavigateLookup;
+ private PageToken _currentPageToken;
private readonly INavigationService _navigationService;
private readonly ISessionStateService _sessionStateService;
private bool _showMenuButton;
@@ -44,8 +44,8 @@ namespace NextcloudApp.ViewModels
DisplayName = resourceLoader.GetString("AllFiles"),
FontIcon = "\uE8B7",
Command = new DelegateCommand(
- () => NavigateToPage(PageTokens.DirectoryList),
- () => CanNavigateToPage(PageTokens.DirectoryList)
+ () => NavigateToPage(PageToken.DirectoryList),
+ () => CanNavigateToPage(PageToken.DirectoryList)
)
},
};
@@ -57,8 +57,8 @@ namespace NextcloudApp.ViewModels
DisplayName = resourceLoader.GetString("Settings"),
FontIcon = "\uE713",
Command = new DelegateCommand(
- () => NavigateToPage(PageTokens.Settings),
- () => CanNavigateToPage(PageTokens.Settings)
+ () => NavigateToPage(PageToken.Settings),
+ () => CanNavigateToPage(PageToken.Settings)
)
},
new MenuItem
@@ -66,8 +66,8 @@ namespace NextcloudApp.ViewModels
DisplayName = resourceLoader.GetString("SynchronizationConflicts/Header"),
FontIcon = "\uEA6A",
Command = new DelegateCommand(
- () => NavigateToPage(PageTokens.SyncConflict),
- () => CanNavigateToPage(PageTokens.SyncConflict)
+ () => NavigateToPage(PageToken.SyncConflict),
+ () => CanNavigateToPage(PageToken.SyncConflict)
)
},
};
@@ -78,9 +78,9 @@ namespace NextcloudApp.ViewModels
};
GetUserInformation();
- _canNavigateLookup = new Dictionary<PageTokens, bool>();
+ _canNavigateLookup = new Dictionary<PageToken, bool>();
- foreach (PageTokens pageToken in Enum.GetValues(typeof(PageTokens)))
+ foreach (PageToken pageToken in Enum.GetValues(typeof(PageToken)))
{
_canNavigateLookup.Add(pageToken, true);
}
@@ -90,7 +90,7 @@ namespace NextcloudApp.ViewModels
return;
}
// Resuming, so update the menu to reflect the current page correctly
- PageTokens currentPageToken;
+ PageToken currentPageToken;
if (!Enum.TryParse(_sessionStateService.SessionState[CurrentPageTokenKey].ToString(), out currentPageToken))
{
return;
@@ -171,7 +171,7 @@ namespace NextcloudApp.ViewModels
private void OnNavigationStateChanged(NavigationStateChangedEventArgs args)
{
- PageTokens currentPageToken;
+ PageToken currentPageToken;
if (!Enum.TryParse(args.Sender.Content.GetType().Name.Replace("Page", string.Empty), out currentPageToken))
{
return;
@@ -181,7 +181,7 @@ namespace NextcloudApp.ViewModels
RaiseCanExecuteChanged();
}
- private void NavigateToPage(PageTokens pageToken)
+ private void NavigateToPage(PageToken pageToken)
{
if (!CanNavigateToPage(pageToken))
{
@@ -195,12 +195,12 @@ namespace NextcloudApp.ViewModels
RaiseCanExecuteChanged();
}
- private bool CanNavigateToPage(PageTokens pageToken)
+ private bool CanNavigateToPage(PageToken pageToken)
{
return _canNavigateLookup[pageToken];
}
- private void UpdateCanNavigateLookup(PageTokens navigatedTo)
+ private void UpdateCanNavigateLookup(PageToken navigatedTo)
{
if (navigatedTo == _currentPageToken)
{
@@ -210,9 +210,9 @@ namespace NextcloudApp.ViewModels
_canNavigateLookup[navigatedTo] = false;
_currentPageToken = navigatedTo;
ShowMenuButton =
- _currentPageToken != PageTokens.Login &&
- _currentPageToken != PageTokens.FileDownload &&
- _currentPageToken != PageTokens.FileUpload;
+ _currentPageToken != PageToken.Login &&
+ _currentPageToken != PageToken.FileDownload &&
+ _currentPageToken != PageToken.FileUpload;
IsMenuOpen = false;
}
diff --git a/NextcloudApp/ViewModels/SettingsPageViewModel.cs b/NextcloudApp/ViewModels/SettingsPageViewModel.cs
index c5492ec..769deda 100644
--- a/NextcloudApp/ViewModels/SettingsPageViewModel.cs
+++ b/NextcloudApp/ViewModels/SettingsPageViewModel.cs
@@ -203,7 +203,7 @@ namespace NextcloudApp.ViewModels
private void Reset()
{
SettingsService.Instance.Reset();
- _navigationService.Navigate(PageTokens.Login.ToString(), null);
+ _navigationService.Navigate(PageToken.Login.ToString(), null);
}
}
} \ No newline at end of file
diff --git a/NextcloudApp/ViewModels/VerificationPageViewModel.cs b/NextcloudApp/ViewModels/VerificationPageViewModel.cs
index d5c015c..a1b4356 100644
--- a/NextcloudApp/ViewModels/VerificationPageViewModel.cs
+++ b/NextcloudApp/ViewModels/VerificationPageViewModel.cs
@@ -39,7 +39,7 @@ namespace NextcloudApp.ViewModels
}
else
{
- this.nextPage = PageTokens.DirectoryList.ToString();
+ this.nextPage = PageToken.DirectoryList.ToString();
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 06:05:51 +0300