Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ADD] New "about account" page in settings #252

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion source/EduCATS/EduCATS.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@
<Folder Include="Pages\Recommendations\Views\ViewCells\" />
<Folder Include="Pages\Recommendations\ViewModels\" />
<Folder Include="Pages\Recommendations\Models\" />
<Folder Include="Pages\Settings\" />
<Folder Include="Pages\Settings\Base\" />
<Folder Include="Pages\Settings\Base\Models\" />
<Folder Include="Pages\Settings\Base\ViewModels\" />
Expand Down
32 changes: 24 additions & 8 deletions source/EduCATS/Helpers/Forms/Pages/AppPages.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
using EduCATS.Pages.SaveLabsAndPracticeMarks.Views;
using EduCATS.Pages.SaveMarks.Views;
using EduCATS.Pages.Settings.About.Views;
using EduCATS.Pages.Settings.Profile.Views;
using EduCATS.Pages.Settings.Base.Views;
using EduCATS.Pages.Settings.Fonts.Views;
using EduCATS.Pages.Settings.Language.Views;
Expand All @@ -44,7 +45,8 @@ public class AppPages : IPages
/// <summary>
/// Property for getting and setting <see cref="Application.Current.MainPage"/>.
/// </summary>
NavigationPage mainPage {
NavigationPage mainPage
{
get => Application.Current.MainPage as NavigationPage;
set => Application.Current.MainPage = value;
}
Expand All @@ -57,9 +59,12 @@ public class AppPages : IPages
/// <returns>Task.</returns>
public async Task ClosePage(bool modal, bool animated = true)
{
if (modal) {
if (modal)
{
await mainPage.Navigation.PopModalAsync(animated);
} else {
}
else
{
await mainPage.Navigation.PopAsync(animated);
}
}
Expand All @@ -82,7 +87,7 @@ public async Task ClosePage(bool modal, bool animated = true)
/// <param name="title"></param>
/// <returns></returns>
public async Task OpenFindGroup(string title) =>
await pushPage(new FindGroupPageView(),title);
await pushPage(new FindGroupPageView(), title);

public async Task OpenParentalStats(GroupInfo group, string title) =>
await pushPage(new ParentalStatsPageView(group), title);
Expand Down Expand Up @@ -229,6 +234,13 @@ public async Task ClosePage(bool modal, bool animated = true)
public async Task OpenSettingsAbout(string title) =>
await pushPage(new AboutPageView(), title);

/// <summary>
/// Change Application's main page without animation.
/// </summary>
/// <param name="newPage">Page to set.</param>
public async Task OpenProfileAbout(string title) =>
await pushPage(new ProfilePageView(), title);

/// <summary>
/// Change Application's main page without animation.
/// </summary>
Expand All @@ -245,10 +257,13 @@ public async Task ClosePage(bool modal, bool animated = true)
/// <returns>Task.</returns>
async Task pushPage(Page newPage, string title = null, bool isModal = false)
{
if (isModal) {
if (isModal)
{
await mainPage.Navigation.PushModalAsync(
getNavigationPage(newPage, title));
} else {
}
else
{
await mainPage.Navigation.PushAsync(
getNavigationPage(newPage, title));
}
Expand All @@ -260,7 +275,8 @@ async Task pushPage(Page newPage, string title = null, bool isModal = false)
/// <param name="page">Page to convert.</param>
/// <param name="title">Page title.</param>
/// <returns>Task.</returns>
NavigationPage getNavigationPage(Page page, string title = "") => new NavigationPage(page) {
NavigationPage getNavigationPage(Page page, string title = "") => new NavigationPage(page)
{
Title = title,
BarBackgroundColor = Color.FromHex(Theme.Current.AppNavigationBarBackgroundColor),
BarTextColor = Color.FromHex(Theme.Current.BaseAppColor)
Expand All @@ -272,7 +288,7 @@ async Task pushPage(Page newPage, string title = null, bool isModal = false)
public async Task OpenForgotPassword(string title) =>
await pushPage(new ForgotPasswordPageView(), title);

public async Task OpenAddMarks(string title, GroupItemModel groupId, int subjectId,string groupName) =>
public async Task OpenAddMarks(string title, GroupItemModel groupId, int subjectId, string groupName) =>
await pushPage(new SaveMarksPageView(subjectId, groupId.GroupId, title, groupName), title);

public async Task OpenAddMarksPracticeAndLabs(string title, GroupItemModel groupId, int subject, string groupName) =>
Expand Down
11 changes: 9 additions & 2 deletions source/EduCATS/Helpers/Forms/Pages/Interfaces/IPages.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ public interface IPages
/// </summary>
/// <param name="title">Title.</param>
/// <returns></returns>
public Task OpenFindGroup(string title);
public Task OpenFindGroup(string title);
/// <summary>
/// Open parental control statistics
/// </summary>
Expand Down Expand Up @@ -180,5 +180,12 @@ public interface IPages
/// <param name="title">Title.</param>
/// <returns>Task.</returns>
Task OpenSettingsAbout(string title);

/// <summary>
/// Open Settings About application page.
/// </summary>
/// <param name="title">Title.</param>
/// <returns>Task.</returns>
Task OpenProfileAbout(string title);
}
}
13 changes: 12 additions & 1 deletion source/EduCATS/Localization/be.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"main_statistics": "Статыстыка",
"main_settings": "Налады",

"today_subjects": "Прадметы",
"today_subjects": "Расклад",
"today_news": "Навіны",
"today_news_load_error": "Здарылася памылка падчас атрымання спісу навін. Калі ласка абнавіце старонку альбо звярніцеся ў службу падтрымкі.",
"today_subjects_error": "Здарылася памылка падчас атрымання спісу прадметаў. Калі ласка абнавіце старонку альбо звярніцеся ў службу падтрымкі.",
Expand Down Expand Up @@ -86,6 +86,11 @@
"learning_card_files": "Файлы",
"learning_card_adaptive": "Адаптыўнае навучанне",

"update_title": "Абнаўленне",
"update_message": "Выйшла абнаўленне ",
"update_link_button": "Абнавіць",
"update_cancel_button": "Пазней",

"testing_get_tests_error": "Здарылася памылка падчас атрымання тэстаў. Калі ласка абнавіце старонку альбо звярніцеся ў службу падтрымкі.",
"testing_knowledge_control": "Тэсты для кантролю ведаў",
"testing_self_study": "Тэсты для самакантролю",
Expand Down Expand Up @@ -126,6 +131,7 @@
"settings_font": "Тэкст & Шрыфт",
"settings_delete": "Выдаліць акаўнт",
"settings_about": "Пра дадатак",
"settings_about_profile": "Аб акаўнце",
"settings_logout": "Выйсці",
"settings_logout_message": "Вы насамрэч жадаеце выйсці?",

Expand Down Expand Up @@ -173,6 +179,11 @@
"name": "Імя",
"surname": "Прозвішча",
"patronymic": "Імя па бацьку",
"login": "Лагін",
"email": "Пошта",
"phone": "Тэлефон",
"accountinfo": "Skype, Viber, Telegram і др.",
"about": "Пра сябе",
"confirm_password": "Пацверджанне пароля",
"select_secret_question": "Серкретный пытанне",
"choose_group": "Группа",
Expand Down
13 changes: 12 additions & 1 deletion source/EduCATS/Localization/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"main_statistics": "Statistik",
"main_settings": "Einstellungen",

"today_subjects": "Studienfächer",
"today_subjects": "Zeitplan",
"today_news": "Nachrichten",
"today_news_load_error": "Fehler beim abrufen der Nachrichtenliste. Bitte aktualisieren Sie die Seite oder Kontaktieren Sie den Support.",
"today_subjects_error": "Fehler beim abrufen der Artikelliste. Bitte aktualisieren Sie die Seite oder Kontaktieren Sie den Support.",
Expand Down Expand Up @@ -88,6 +88,11 @@
"learning_card_files": "Dateien",
"learning_card_adaptive": "Adaptives lernen",

"update_title": "Aktualisieren",
"update_message": "Update veröffentlicht ",
"update_link_button": "Aktualisieren",
"update_cancel_button": "Später",

"testing_get_tests_error": "Fehler beim abrufen von Tests. Bitte aktualisieren Sie die Seite oder Kontaktieren Sie den Support.",
"testing_knowledge_control": "Tests zur Wissenskontrolle",
"testing_self_study": "Tests zur Selbstkontrolle",
Expand Down Expand Up @@ -128,6 +133,7 @@
"settings_font": "Text & Schriftart",
"settings_delete": "Konto löschen",
"settings_about": "Über die App ",
"settings_about_profile": "Über das Konto",
"settings_logout": "Abmelden",
"settings_logout_message": "Möchten Sie wirklich abmelden?",

Expand Down Expand Up @@ -175,6 +181,11 @@
"name": "Name",
"surname": "Vorname",
"patronymic": "Patronym",
"login": "Anmeldung",
"email": "Post",
"phone": "Telefon",
"accountinfo": "Skype, Viber, Telegram und andere",
"about": "Über mich",
"confirm_password": "Confirm password",
"select_secret_question": "Spezifische Frage",
"select_group": "Group",
Expand Down
13 changes: 12 additions & 1 deletion source/EduCATS/Localization/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"main_statistics": "Statistics",
"main_settings": "Settings",

"today_subjects": "Subjects",
"today_subjects": "Schedule",
"today_news": "News",
"today_news_load_error": "Error occurred during retrieving news. Please try to refresh page or contact support.",
"today_subjects_error": "Error occurred during retrieving subjects. Please try to refresh page or contact support.",
Expand Down Expand Up @@ -88,6 +88,11 @@
"learning_card_files": "Files",
"learning_card_adaptive": "Adaptive learning",

"update_title": "Update",
"update_message": "Update released ",
"update_link_button": "Update",
"update_cancel_button": "Later",

"testing_get_tests_error": "Error occurred during retrieving tests. Please try to refresh page or contact support.",
"testing_knowledge_control": "Tests for knowledge control",
"testing_self_study": "Tests for self-study",
Expand Down Expand Up @@ -128,6 +133,7 @@
"settings_font": "Text & Font",
"settings_delete": "Delete account",
"settings_about": "About application",
"settings_about_profile": "About the account",
"settings_logout": "Logout",
"settings_logout_message": "Are you sure you want to logout?",

Expand Down Expand Up @@ -175,6 +181,11 @@
"name": "Name",
"surname": "Last name",
"patronymic": "Patronymic",
"login": "Login",
"email": "Email",
"phone": "Telephone",
"accountinfo": "Skype, Viber, Telegram and other",
"about": "About",
"confirm_password": "Confirm password",
"select_secret_question": "Specific question",
"choose_group": "Group",
Expand Down
13 changes: 12 additions & 1 deletion source/EduCATS/Localization/lt.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"main_statistics": "Statistika",
"main_settings": "Nustatymai",

"today_subjects": "Dalykai",
"today_subjects": "Tvarkaraštį",
"today_news": "Naujienos",
"today_news_load_error": "Gaunant naujienų sąrašą įvyko klaida. Atnaujinkite puslapį arba susisiekite su palaikymo tarnyba.",
"today_subjects_error": "Gaunant elementų sąrašą įvyko klaida. Atnaujinkite puslapį arba susisiekite su palaikymo tarnyba.",
Expand Down Expand Up @@ -89,6 +89,11 @@
"learning_card_files": "Failai",
"learning_card_adaptive": "Adaptyvusis mokymasis",

"update_title": "Atnaujinti",
"update_message": "Atnaujinimas išleistas ",
"update_link_button": "Atnaujinti",
"update_cancel_button": "Vėliau",

"testing_get_tests_error": "Gaunant testus įvyko klaida. Atnaujinkite puslapį arba susisiekite su palaikymo tarnyba.",
"testing_knowledge_control": "Žinių kontrolės testai",
"testing_self_study": "Savikontrolės testai",
Expand Down Expand Up @@ -129,6 +134,7 @@
"settings_font": "Tekstas ir šriftas",
"settings_delete": "Eliminare l'account",
"settings_about": "Apie programą",
"settings_about_profile": "Apie paskyrą",
"settings_logout": "Atsijungti",
"settings_logout_message": "Ar tikrai norite atsijungti ?",

Expand Down Expand Up @@ -176,6 +182,11 @@
"name": "Vardas",
"surname": "Pavardė",
"patronymic": "Tėvavardis",
"login": "Prisijungti",
"email": "Paštas",
"phone": "Telefonas",
"accountinfo": "Skype, Viber, Telegram ir kita",
"about": "Apie mane",
"confirm_password": "Patvirtinti slaptažodį",
"select_secret_question": "Konkretus klausimas",
"select_group": "Grupė",
Expand Down
13 changes: 12 additions & 1 deletion source/EduCATS/Localization/pl.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"main_statistics": "Statystyk",
"main_settings": "Konfiguracja",

"today_subjects": "Dyscypliny",
"today_subjects": "harmonogram",
"today_news": "Wiadomości",
"today_news_load_error": "Wystąpił błąd podczas pobierania listy wiadomości. Proszę odświeżyć stronę lub skontaktować się z obsługą klienta.",
"today_subjects_error": "Wystąpił błąd podczas pobierania listy dyscyplin. Proszę odświeżyć stronę lub skontaktować się z obsługą klienta.",
Expand Down Expand Up @@ -87,6 +87,11 @@
"learning_card_files": "Dokumenty",
"learning_card_adaptive": "Uczenie adaptacyjne",

"update_title": "Aktualizacja",
"update_message": "Aktualizacja wydana ",
"update_link_button": "Aktualizacja",
"update_cancel_button": "Później",

"testing_get_tests_error": "Wystąpił błąd podczas pobierania testów. Proszę odświeżyć stronę lub skontaktować się z obsługą klienta.",
"testing_knowledge_control": "Testy dla kontroli wiedzy",
"testing_self_study": "Testy dla samokontroli",
Expand Down Expand Up @@ -127,6 +132,7 @@
"settings_font": "Tekst & Czcionka",
"settings_delete": "Usuń konto",
"settings_about": "Informacje o aplikacji",
"settings_about_profile": "O koncie",
"settings_logout": "Wyjść",
"settings_logout_message": "Czy na pewno chcesz wyjść?",

Expand Down Expand Up @@ -174,6 +180,11 @@
"name": "Nazwa",
"surname": "Nazwisko",
"patronymic": "Patronimiczny",
"login": "Zaloguj sie",
"email": "Poczta",
"phone": "Telefon",
"accountinfo": "Skype, Viber, Telegram i inne.",
"about": "O mnie",
"confirm_password": "Potwierdź hasło",
"select_secret_question": "Konkretne pytanie",
"choose_group": "Grupa",
Expand Down
15 changes: 14 additions & 1 deletion source/EduCATS/Localization/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,13 @@
"main_settings": "Настройки",


"today_subjects": "Предметы",
"today_subjects": "Расписание",
"today_news": "Новости",
"today_news_load_error": "Произошла ошибка во время получения списка новостей. Пожалуйста, обновите страницу или обратитесь в службу поддержки.",
"today_subjects_error": "Произошла ошибка во время получения списка предметов. Пожалуйста, обновите страницу или обратитесь в службу поддержки.",
"today_calendar_error": "Произошла ошибка во время получения списка предметов в календаре. Пожалуйста, обновите страницу или обратитесь в службу поддержки.",
"today_account_error": "Произошла ошибка во время получения информацию об аккаунте. Пожалуйста, обновите страницу или обратитесь в службу поддержки.",


"news_details_title": "Новости",

Expand Down Expand Up @@ -91,6 +93,11 @@
"learning_card_files": "Файлы",
"learning_card_adaptive": "Адаптивное обучение",

"update_title": "Обновление",
"update_message": "Вышло обновление ",
"update_link_button": "Обновить",
"update_cancel_button": "Позже",

"testing_get_tests_error": "Произошла ошибка во время получения тестов. Пожалуйста, обновите страницу или обратитесь в службу поддержки.",
"testing_knowledge_control": "Тесты для контроля знаний",
"testing_self_study": "Тесты для самоконтроля",
Expand Down Expand Up @@ -131,6 +138,7 @@
"settings_font": "Текст & Шрифт",
"settings_delete": "Удалить аккаунт",
"settings_about": "О приложении",
"settings_about_profile": "Об аккаунте",
"settings_logout": "Выйти",
"settings_logout_message": "Вы действительно хотите выйти?",

Expand Down Expand Up @@ -178,6 +186,11 @@
"name": "Имя",
"surname": "Фамилия",
"patronymic": "Отчество",
"login": "Логин",
"email": "Почта",
"phone": "Телефон",
"accountinfo": "Skype, Viber, Telegram и др.",
"about": "О себе",
"confirm_password": "Подтверждение пароля",
"select_secret_question": "Секретный вопрос",
"choose_group": "Группа",
Expand Down
Loading
Loading