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

Compare commits

base: vergnet:1e0cc867b8bb96db2e7a05821fb6e3439ac2627d
Branches Tags
vergnet:master
vergnet:functional-migration
vergnet:v5.0.0-3
vergnet:v5.0.0-2
vergnet:4.1.0
vergnet:4.0.1
vergnet:3.0.7
..
compare: vergnet:e1014a173e54b15f10650001736ddaf1ff4d3e73
Branches Tags
vergnet:master
vergnet:functional-migration
vergnet:v5.0.0-3
vergnet:v5.0.0-2
vergnet:4.1.0
vergnet:4.0.1
vergnet:3.0.7

No commits in common. "1e0cc867b8bb96db2e7a05821fb6e3439ac2627d" and "e1014a173e54b15f10650001736ddaf1ff4d3e73" have entirely different histories.
1e0cc867b8 ... e1014a173e

5 changed files with 42 additions and 63 deletions
Show stats Expand all files Collapse all files

57
android/app/src/main/AndroidManifest.xml
View file

@ -1,37 +1,26 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="fr.amicaleinsat.application"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="fr.amicaleinsat.application">
<uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.CAMERA"/> <uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.VIBRATE"/> <uses-permission android:name="android.permission.VIBRATE"/>
<uses-permission android:name="android.permission.READ_INTERNAL_STORAGE"/> <uses-permission android:name="android.permission.READ_INTERNAL_STORAGE"/>
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/> <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
<application <application android:name=".MainApplication" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="false" android:theme="@style/AppTheme">
android:name=".MainApplication" <meta-data android:name="com.facebook.sdk.AutoInitEnabled" android:value="false"/>
android:label="@string/app_name" <meta-data android:name="com.facebook.sdk.AutoLogAppEventsEnabled" android:value="false"/>
android:icon="@mipmap/ic_launcher" <meta-data android:name="com.facebook.sdk.AdvertiserIDCollectionEnabled" android:value="false"/>
android:roundIcon="@mipmap/ic_launcher_round" <activity android:name=".MainActivity" android:label="@string/app_name" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode" android:launchMode="singleTask" android:windowSoftInputMode="adjustResize" android:screenOrientation="portrait">
android:allowBackup="false" <intent-filter>
android:theme="@style/AppTheme" <action android:name="android.intent.action.MAIN"/>
android:usesCleartextTraffic="true" <category android:name="android.intent.category.LAUNCHER"/>
> </intent-filter>
<meta-data android:name="com.facebook.sdk.AutoInitEnabled" android:value="false"/> <intent-filter>
<meta-data android:name="com.facebook.sdk.AutoLogAppEventsEnabled" android:value="false"/> <action android:name="android.intent.action.VIEW"/>
<meta-data android:name="com.facebook.sdk.AdvertiserIDCollectionEnabled" android:value="false"/> <category android:name="android.intent.category.DEFAULT"/>
<activity android:name=".MainActivity" android:label="@string/app_name" <category android:name="android.intent.category.BROWSABLE"/>
android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode" <data android:scheme="campus-insat"/>
android:launchMode="singleTask" android:windowSoftInputMode="adjustResize" </intent-filter>
android:screenOrientation="portrait"> </activity>
<intent-filter> <activity android:name="com.facebook.react.devsupport.DevSettingsActivity"/>
<action android:name="android.intent.action.MAIN"/> </application>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.BROWSABLE"/>
<data android:scheme="campus-insat"/>
</intent-filter>
</activity>
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity"/>
</application>
</manifest> </manifest>

2
src/components/Screens/ErrorView.js
View file

@ -160,7 +160,7 @@ class ErrorView extends React.PureComponent<Props, State> {
const styles = StyleSheet.create({ const styles = StyleSheet.create({
outer: { outer: {
height: '99%', // using 100% crashes planex screen for some reason on android 9+ height: '100%',
}, },
inner: { inner: {
marginTop: 'auto', marginTop: 'auto',

1
src/screens/About/AboutScreen.js
View file

@ -229,7 +229,6 @@ class AboutScreen extends React.Component<Props, State> {
<Card.Content> <Card.Content>
<FlatList <FlatList
data={this.appData} data={this.appData}
extraData={this.state.isDebugUnlocked}
keyExtractor={this.keyExtractor} keyExtractor={this.keyExtractor}
renderItem={this.getCardItem} renderItem={this.getCardItem}
/> />

17
src/screens/Planex/PlanexScreen.js
View file

@ -302,18 +302,10 @@ class PlanexScreen extends React.Component<Props, State> {
<View <View
style={{flex: 1}} style={{flex: 1}}
> >
{/*Allow to draw webview bellow banner*/}
<View style={{
position: 'absolute',
height: '100%',
width: '100%',
}}>
{this.props.theme.dark // Force component theme update
? this.getWebView()
: <View style={{height: '100%'}}>{this.getWebView()}</View>}
</View>
<Banner <Banner
style={{marginTop: containerPaddingTop,}} style={{
marginTop: this.state.bannerVisible ? containerPaddingTop : 0,
}}
visible={this.state.bannerVisible} visible={this.state.bannerVisible}
actions={[ actions={[
{ {
@ -338,6 +330,9 @@ class PlanexScreen extends React.Component<Props, State> {
onDismiss={this.hideDialog} onDismiss={this.hideDialog}
title={this.state.dialogTitle} title={this.state.dialogTitle}
message={this.state.dialogMessage}/> message={this.state.dialogMessage}/>
{this.props.theme.dark // Force component theme update
? this.getWebView()
: <View style={{height: '100%'}}>{this.getWebView()}</View>}
<AnimatedBottomBar <AnimatedBottomBar
{...this.props} {...this.props}
ref={this.barRef} ref={this.barRef}

28
src/screens/Proxiwash/ProxiwashScreen.js
View file

@ -424,23 +424,10 @@ class ProxiwashScreen extends React.Component<Props, State> {
<View <View
style={{flex: 1}} style={{flex: 1}}
> >
<View style={{
position: "absolute",
width: "100%",
height: "100%",
}}>
<WebSectionList
createDataset={this.createDataset}
navigation={nav}
fetchUrl={DATA_URL}
renderItem={this.getRenderItem}
renderSectionHeader={this.getRenderSectionHeader}
autoRefreshTime={REFRESH_TIME}
refreshOnFocus={true}
updateData={this.state.machinesWatched.length}/>
</View>
<Banner <Banner
style={{marginTop: containerPaddingTop,}} style={{
marginTop: this.state.bannerVisible ? containerPaddingTop : 0,
}}
visible={this.state.bannerVisible} visible={this.state.bannerVisible}
actions={[ actions={[
{ {
@ -458,6 +445,15 @@ class ProxiwashScreen extends React.Component<Props, State> {
<CustomModal onRef={this.onModalRef}> <CustomModal onRef={this.onModalRef}>
{this.state.modalCurrentDisplayItem} {this.state.modalCurrentDisplayItem}
</CustomModal> </CustomModal>
<WebSectionList
createDataset={this.createDataset}
navigation={nav}
fetchUrl={DATA_URL}
renderItem={this.getRenderItem}
renderSectionHeader={this.getRenderSectionHeader}
autoRefreshTime={REFRESH_TIME}
refreshOnFocus={true}
updateData={this.state.machinesWatched.length}/>
</View> </View>
); );
} }