Compare commits

...

4 commits

5 changed files with 63 additions and 42 deletions

View file

@ -5,11 +5,22 @@
<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 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"> <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:usesCleartextTraffic="true"
>
<meta-data android:name="com.facebook.sdk.AutoInitEnabled" android:value="false"/> <meta-data android:name="com.facebook.sdk.AutoInitEnabled" android:value="false"/>
<meta-data android:name="com.facebook.sdk.AutoLogAppEventsEnabled" android:value="false"/> <meta-data android:name="com.facebook.sdk.AutoLogAppEventsEnabled" android:value="false"/>
<meta-data android:name="com.facebook.sdk.AdvertiserIDCollectionEnabled" android:value="false"/> <meta-data android:name="com.facebook.sdk.AdvertiserIDCollectionEnabled" android:value="false"/>
<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"> <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">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/> <category android:name="android.intent.category.LAUNCHER"/>

View file

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

View file

@ -229,6 +229,7 @@ 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}
/> />

View file

@ -302,10 +302,18 @@ 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={{ style={{marginTop: containerPaddingTop,}}
marginTop: this.state.bannerVisible ? containerPaddingTop : 0,
}}
visible={this.state.bannerVisible} visible={this.state.bannerVisible}
actions={[ actions={[
{ {
@ -330,9 +338,6 @@ 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}

View file

@ -424,10 +424,23 @@ 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={{ style={{marginTop: containerPaddingTop,}}
marginTop: this.state.bannerVisible ? containerPaddingTop : 0,
}}
visible={this.state.bannerVisible} visible={this.state.bannerVisible}
actions={[ actions={[
{ {
@ -445,15 +458,6 @@ 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>
); );
} }