vergnet/application-amicale
5
5
Fork 5
Code Issues Pull requests Releases Wiki Activity

WIP - Add screens to show licence and changelog #9

Closed
Ghost wants to merge 9 commits from (deleted):changelog_and_licence_screens into master
pull from: (deleted):changelog_and_licence_screens
merge into: vergnet:master
Conversation 0 Commits 9 Files changed 6 +14 -7
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit d6ab911ecb - Show all commits

21
src/navigation/MainNavigator.js
View file

@ -25,7 +25,8 @@ import {
getWebsiteStack, getWebsiteStack,
} from '../utils/CollapsibleUtils'; } from '../utils/CollapsibleUtils';
import BugReportScreen from '../screens/Other/FeedbackScreen'; import BugReportScreen from '../screens/Other/FeedbackScreen';
import ChangelogScreen from '../screens/Other/ChangeLogScreen'; import ChangelogScreen from '../screens/Other/ChangelogScreen';
import LicenceScreen from "../screens/Other/LicenceScreen";
import WebsiteScreen from '../screens/Services/WebsiteScreen'; import WebsiteScreen from '../screens/Services/WebsiteScreen';
import EquipmentScreen from '../screens/Amicale/Equipment/EquipmentListScreen'; import EquipmentScreen from '../screens/Amicale/Equipment/EquipmentListScreen';
import EquipmentLendScreen from '../screens/Amicale/Equipment/EquipmentRentScreen'; import EquipmentLendScreen from '../screens/Amicale/Equipment/EquipmentRentScreen';
@ -215,12 +216,18 @@ function MainStackComponent(props: {
BugReportScreen, BugReportScreen,
i18n.t('screens.feedback.title'), i18n.t('screens.feedback.title'),
)} )}
{createScreenCollapsibleStack( {createScreenCollapsibleStack(
'changelog', 'changelog',
MainStack, MainStack,
ChangelogScreen, ChangelogScreen,
i18n.t('screens.changelog.title') i18n.t('screens.about.changelog')
)} )}
{createScreenCollapsibleStack(
'licence',
MainStack,
LicenceScreen,
i18n.t('screens.about.license')
)}
</MainStack.Navigator> </MainStack.Navigator>
); );
} }