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

fix: affichage correct des pages en ajoutant des animations #373

Closed
wants to merge 19 commits 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
14 changes: 12 additions & 2 deletions src/router/screens/account/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,53 +7,63 @@ import NewsScreen from "@/views/account/News/News";
import Grades from "@/views/account/Grades/Grades";
import Attendance from "@/views/account/Attendance/Attendance";
import Messages from "@/views/account/Chat/Messages";
import PlaceholderScreen from "@/views/account/Home/PlaceholderScreen";
import { Platform } from "react-native";

const animation = Platform.OS === "android" ? "slide_from_bottom" : "none";

export const screens = [
createScreen("Home", () => <HomeStackScreen accountScreens={screens} />, {
Kgeek33 marked this conversation as resolved.
Show resolved Hide resolved
headerShown: false,
tabBarLabel: "Accueil",
tabBarLottie: require("@/../assets/lottie/tab_home.json"),
animation: "none",
}),
createScreen("Lessons", Lessons, {
headerTitle: "Cours",
headerShown: false,
tabBarLabel: "Cours",
tabBarLottie: require("@/../assets/lottie/tab_calendar.json"),
animation,
}),
createScreen("Homeworks", Homeworks, {
headerTitle: "Devoirs",
headerShown: false,
tabBarLabel: "Devoirs",
tabBarLottie: require("@/../assets/lottie/tab_book_2.json"),
animation,
}),
createScreen("Grades", Grades, {
headerTitle: "Notes",
headerShown: false,
tabBarLabel: "Notes",
tabBarLottie: require("@/../assets/lottie/tab_chart.json"),
animation,
}),
createScreen("News", NewsScreen, {
headerTitle: "Actualités",
tabBarLabel: "Actualités",
tabBarLottie: require("@/../assets/lottie/tab_news.json"),
animation,
}),
createScreen("Attendance", Attendance, {
headerTitle: "Vie scolaire",
headerShown: false,
tabBarLabel: "Vie sco.",
tabBarLottie: require("@/../assets/lottie/tab_check.json"),
animation,
}),
createScreen("Messages", Messages, {
headerTitle: "Messages",
tabBarLabel: "Messages",
tabBarLottie: require("@/../assets/lottie/tab_chat.json"),
animation,
}),
createScreen("Menu", Menu, {
headerTitle: "Cantine",
tabBarLabel: "Cantine",
tabBarLottie: require("@/../assets/lottie/tab_pizza.json"),
animation,
}),
] as Array<ReturnType<typeof createScreen>>;

export default screens;
export default screens;
3 changes: 2 additions & 1 deletion src/router/screens/login/ecoledirecte.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import EcoleDirecteCredentials from "@/views/login/ecoledirecte/EcoleDirecteCred
export default [
createScreen("EcoleDirecteCredentials", EcoleDirecteCredentials, {
headerTitle: "Connexion à EcoleDirecte",
headerBackVisible: true
headerBackVisible: true,
animation: "slide_from_right",
}),
] as const;
8 changes: 7 additions & 1 deletion src/router/screens/login/identityProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,43 +5,49 @@ import UnivRennes1_Login from "@/views/login/IdentityProvider/providers/UnivRenn
import UnivLimoges_Login from "@/views/login/IdentityProvider/providers/UnivLimoges";
import UnivRennes2_Login from "@/views/login/IdentityProvider/providers/UnivRennes2";
import UnivSorbonneParisNord_login from "@/views/login/IdentityProvider/providers/UnivSorbonneParisNord";
//import UnivUphf_Login from "@/views/login/IdentityProvider/providers/UnivUphf";
import { UnivIUTLannion_Login } from "@/views/login/IdentityProvider/providers/UnivIUTLannion";
import Muli_Login from "@/views/login/IdentityProvider/providers/Multi";

export default [
createScreen("IdentityProviderSelector", IdentityProviderSelector, {
headerTitle: "Universités et autres",
headerBackVisible: true,
animation: "slide_from_right",
}),

createScreen("UnivRennes1_Login", UnivRennes1_Login, {
headerBackVisible: true,
headerTitle: "Université de Rennes",
animation: "slide_from_right",
}),

createScreen("UnivRennes2_Login", UnivRennes2_Login, {
headerBackVisible: true,
headerTitle: "Université de Rennes 2",
animation: "slide_from_right",
}),

createScreen("UnivIUTLannion_Login", UnivIUTLannion_Login, {
headerBackVisible: true,
headerTitle: "IUT de Lannion",
animation: "slide_from_right",
}),

createScreen("UnivLimoges_Login", UnivLimoges_Login, {
headerBackVisible: true,
headerTitle: "Université de Limoges",
animation: "slide_from_right",
}),

createScreen("UnivSorbonneParisNord_login", UnivSorbonneParisNord_login, {
headerBackVisible: true,
headerTitle: "Université Sorbonne Paris Nord",
animation: "slide_from_right",
}),

createScreen("Multi_Login", Muli_Login, {
headerBackVisible: true,
headerTitle: "ESUP Multi",
animation: "slide_from_right",
}),
] as const;
1 change: 0 additions & 1 deletion src/router/screens/login/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ export default [
headerTransparent: true,
headerBackVisible: true,
animation: "slide_from_bottom",
animationDuration: 250
}),

...pronote,
Expand Down
29 changes: 19 additions & 10 deletions src/router/screens/login/pronote.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,54 +11,63 @@ import PronoteWebview from "@/views/login/pronote/PronoteWebview";
import PronoteV6Import from "@/views/login/pronote/PronoteV6Import";
import Pronote2FA_Auth from "@/views/login/pronote/Pronote2FA_Auth";


export default [
createScreen("PronoteAuthenticationSelector", PronoteAuthenticationSelector, {
headerTitle: "",
headerTransparent: true,
headerBackVisible: true
headerBackVisible: true,
animation: "slide_from_right",
}),
createScreen("PronoteGeolocation", PronoteGeolocation, {
headerTitle: "",
headerTransparent: true,
headerBackVisible: true
headerBackVisible: true,
animation: "slide_from_right",
}),
createScreen("PronoteInstanceSelector", PronoteInstanceSelector, {
headerTitle: "",
headerTransparent: true,
headerBackVisible: true
headerBackVisible: true,
animation: "slide_from_right",
}),
createScreen("PronoteManualLocation", PronoteManualLocation, {
headerTitle: "",
headerTransparent: true,
headerBackVisible: true
headerBackVisible: true,
animation: "slide_from_right",
}),
createScreen("PronoteQRCode", PronoteQRCode, {
headerTitle: "",
headerTintColor: "white",
headerTransparent: true,
headerBackVisible: true
headerBackVisible: true,
animation: "slide_from_right",
}),
createScreen("PronoteCredentials", PronoteCredentials, {
headerTitle: "Connexion à PRONOTE",
headerBackVisible: true
headerBackVisible: true,
animation: "slide_from_right",
}),
createScreen("PronoteManualURL", PronoteManualURL, {
headerTitle: "",
headerTransparent: true,
headerBackVisible: true
headerBackVisible: true,
animation: "slide_from_right",
}),
createScreen("PronoteWebview", PronoteWebview, {
headerTitle: "",
headerTransparent: true,
headerBackVisible: true
headerBackVisible: true,
animation: "slide_from_right",
}),
createScreen("PronoteV6Import", PronoteV6Import, {
headerTitle: "Importer d'une ancienne version",
presentation: "modal",
animation: "slide_from_right",
}),
createScreen("Pronote2FA_Auth", Pronote2FA_Auth, {
headerTitle: "Connexion à PRONOTE",
headerBackVisible: true
headerBackVisible: true,
animation: "slide_from_right",
}),
] as const;
25 changes: 16 additions & 9 deletions src/router/screens/login/skolengo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,33 @@ import SkolengoGeolocation from "@/views/login/skolengo/SkolengoGeolocation";
import SkolengoInstanceSelector from "@/views/login/skolengo/SkolengoInstanceSelector";
import SkolengoWebview from "@/views/login/skolengo/SkolengoWebview";


export default [
createScreen("SkolengoAuthenticationSelector", SkolengoAuthenticationSelector, {
headerTitle: "",
headerTransparent: true,
headerBackVisible: true
}),
createScreen(
"SkolengoAuthenticationSelector",
SkolengoAuthenticationSelector,
{
headerTitle: "",
headerTransparent: true,
headerBackVisible: true,
animation: "slide_from_right",
}
),
createScreen("SkolengoGeolocation", SkolengoGeolocation, {
headerTitle: "",
headerTransparent: true,
headerBackVisible: true
headerBackVisible: true,
animation: "slide_from_right",
}),
createScreen("SkolengoInstanceSelector", SkolengoInstanceSelector, {
headerTitle: "",
headerTransparent: true,
headerBackVisible: true
headerBackVisible: true,
animation: "slide_from_right",
}),
createScreen("SkolengoWebview", SkolengoWebview, {
headerTitle: "",
headerTransparent: true,
headerBackVisible: true
headerBackVisible: true,
animation: "slide_from_right",
}),
] as const;
42 changes: 28 additions & 14 deletions src/router/screens/settings/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,14 @@ import createScreen from "@/router/helpers/create-screen";
import Settings from "@/views/settings/Settings";
import SettingsNotifications from "@/views/settings/SettingsNotifications";
import SettingsProfile from "@/views/settings/SettingsProfile";
import SettingsTrophies from "@/views/settings/SettingsTrophies";
import SettingsTrophies from "@/views/settings/SettingsTrophies";
import SettingsAbout from "@/views/settings/SettingsAbout";
import SettingsIcons from "@/views/settings/SettingsIcons";
import SettingsSubjects from "@/views/settings/SettingsSubjects";
import SettingsExternalServices from "@/views/settings/SettingsExternalServices";
import SettingsMagic from "@/views/settings/SettingsMagic";
import SettingsAddons from "@/views/settings/SettingsAddons";
import AddonPage from "@/views/addon/AddonPage";
import { create } from "lodash";
import ExternalAccountSelectMethod from "@/views/settings/ExternalAccount/SelectMethod";
import SettingsFlags from "@/views/settings/SettingsFlags";
import SettingsDevLogs from "@/views/settings/SettingsDevLogs";
Expand All @@ -31,91 +30,106 @@ const settingsScreens = [
presentation: "modal",
headerTitle: "Paramètres",
headerShown: false,
animation: "simple_push",
}),
createScreen("SettingsNotifications", SettingsNotifications, {
headerTitle: "Notifications",
animation: "slide_from_right",
}),
createScreen("SettingsTrophies", SettingsTrophies, {
headerTitle: "Trophées",
animation: "slide_from_right",
}),
createScreen("SettingsProfile", SettingsProfile, {
headerTitle: "Profil",
animation: "slide_from_right",
}),
createScreen("SettingsAbout", SettingsAbout, {
headerTitle: "À propos",
animation: "slide_from_right",
}),
createScreen("SettingsIcons", SettingsIcons, {
headerTitle: "Icônes",
animation: "slide_from_right",
}),
createScreen("SettingsFlags", SettingsFlags, {
headerTitle: "Flags (développeur)",
animation: "slide_from_right",
}),
createScreen("SettingsFlagsInfos", SettingsFlagsInfos, {
animation: "slide_from_right",
}),
createScreen("SettingsFlagsInfos", SettingsFlagsInfos),

createScreen("SettingsSubjects", SettingsSubjects, {
headerTitle: "Matières",
animation: "slide_from_right",
}),
createScreen("SettingsExternalServices", SettingsExternalServices, {
headerTitle: "Services externes",
animation: "slide_from_right",
}),
createScreen("SettingsMagic", SettingsMagic, {
headerTitle: "Papillon Magic",
animation: "slide_from_right",
}),
createScreen("SettingsAddons", SettingsAddons, {
headerTitle: "Extensions",
animation: "slide_from_right",
}),
createScreen("AddonPage", AddonPage, {
headerTitle: "Extension",
animation: "slide_from_right",
}),

createScreen("ExternalAccountSelectMethod", ExternalAccountSelectMethod, {
headerTitle: "Connexion à un service externe",
animation: "slide_from_right",
}),

createScreen("ExternalAccountSelector", ExternalAccountSelector, {
headerTitle: "Configuration de la cantine",
animation: "slide_from_right",
}),

createScreen("PriceError", PriceError, {
headerTitle: "Configuration de la cantine",
animation: "slide_from_right",
}),

createScreen("QrcodeScanner", QrcodeScanner, {
headerTitle: "Configuration de la cantine",
animation: "slide_from_right",
}),

createScreen("PriceDetectionOnboarding", PriceDetectionOnboarding, {
headerTitle: "Configuration de la cantine",
animation: "slide_from_right",
}),

createScreen("PriceBeforeScan", PriceBeforeScan, {
headerTitle: "Configuration de la cantine",
animation: "slide_from_right",
}),

createScreen("ExternalTurboselfLogin", ExternalTurboselfLogin, {
headerTitle: "Connexion à Turboself",
animation: "slide_from_right",
}),
createScreen("ExternalArdLogin", ExternalArdLogin, {
headerTitle: "Connexion à ARD GEC",
animation: "slide_from_right",
}),
createScreen("ExternalIzlyLogin", ExternalIzlyLogin, {
headerTitle: "Connexion à Izly",
animation: "slide_from_right",
}),

createScreen("IzlyActivation", IzlyActivation, {
headerTitle: "Configuration de Izly",
presentation: "modal",
headerBackVisible: false,
gestureEnabled: false,

animation: "slide_from_right",
}),

createScreen("SettingsDevLogs", SettingsDevLogs, {
headerTitle: "Logs",
animation: "slide_from_right",
}),

createScreen("SettingsDonorsList", SettingsDonorsList, {
headerTitle: "Donateurs",
animation: "slide_from_right",
}),
] as const;

Expand Down
Loading
Loading