diff --git a/app/src/component/AppNavigator.js b/app/src/component/AppNavigator.js
index 18f3ef05..91a4f0a1 100644
--- a/app/src/component/AppNavigator.js
+++ b/app/src/component/AppNavigator.js
@@ -128,14 +128,12 @@ class AppWithNavigationState extends React.Component {
const { dispatch, nav } = this.props;
// There should be a better way to check this
if (nav.routes.length > 0) {
- if (nav.routes[0].routes && nav.routes[0].routes.length > 0) {
- const subRoutes = nav.routes[0].routes[0].routes;
- const lastRoute = subRoutes[subRoutes.length - 1];
- if (nav.routes[0].routes[0].index > 0 &&
- ['About', 'Settings'].indexOf(lastRoute.key) > -1) {
- dispatch(NavigationActions.back());
- return true;
- }
+ const subRoutes = nav.routes[0].routes[0].routes;
+ const lastRoute = subRoutes[subRoutes.length - 1];
+ if (nav.routes[0].routes[0].index > 0 &&
+ ['About', 'Settings'].indexOf(lastRoute.key) > -1) {
+ dispatch(NavigationActions.back());
+ return true;
}
if (nav.routes[0].routeName === 'Main') {
if (nav.routes[0].routes[0].routes[0].index > 0) {
diff --git a/app/src/page/about/view.js b/app/src/page/about/view.js
index 0f33a9c0..29edd73c 100644
--- a/app/src/page/about/view.js
+++ b/app/src/page/about/view.js
@@ -11,11 +11,11 @@ class AboutPage extends React.PureComponent {
lbryId: null,
versionInfo: null
};
-
+
componentDidMount() {
if (NativeModules.VersionInfo) {
NativeModules.VersionInfo.getAppVersion().then(version => {
- this.setState({appVersion: version});
+ this.setState({appVersion: version});
});
}
Lbry.version().then(info => {
@@ -29,11 +29,11 @@ class AboutPage extends React.PureComponent {
});
});
}
-
+
render() {
const loading = 'Loading...';
const ver = this.state.versionInfo ? this.state.versionInfo : null;
-
+
return (
+ Get Social
+
+ You can interact with the LBRY team and members of the community on Discord, Facebook, Instagram, Twitter or Reddit.
+
+
+
+
+
+
+
+
Release information
App version
{this.state.appVersion}
-
+
Daemon (lbrynet)
{ver ? ver.lbrynet_version : loading }
-
+
Wallet (lbryum)
{ver ? ver.lbryum_version : loading }
-
+
Platform
{ver ? ver.platform : loading }
-
+
Installation ID
diff --git a/app/src/page/file/view.js b/app/src/page/file/view.js
index 126c8c79..55098e0b 100644
--- a/app/src/page/file/view.js
+++ b/app/src/page/file/view.js
@@ -99,17 +99,9 @@ class FilePage extends React.PureComponent {
if (mode) {
// fullscreen, so change orientation to landscape mode
NativeModules.ScreenOrientation.lockOrientationLandscape();
- if (NativeModules.UtilityModule) {
- // hide the navigation bar (on devices that use have soft navigation bar)
- NativeModules.UtilityModule.hideNavigationBar();
- }
} else {
// Switch back to portrait mode when the media is not fullscreen
NativeModules.ScreenOrientation.lockOrientationPortrait();
- if (NativeModules.UtilityModule) {
- // hide the navigation bar (on devices that use have soft navigation bar)
- NativeModules.UtilityModule.showNavigationBar();
- }
}
}
}
@@ -146,11 +138,9 @@ class FilePage extends React.PureComponent {
StatusBar.setHidden(false);
if (NativeModules.ScreenOrientation) {
NativeModules.ScreenOrientation.unlockOrientation();
- }
+ }
if (NativeModules.UtilityModule) {
- const utility = NativeModules.UtilityModule;
- utility.keepAwakeOff();
- utility.showNavigationBar();
+ NativeModules.UtilityModule.keepAwakeOff();
}
}
diff --git a/app/src/styles/about.js b/app/src/styles/about.js
index 58d7265f..d9697294 100644
--- a/app/src/styles/about.js
+++ b/app/src/styles/about.js
@@ -33,7 +33,7 @@ const aboutStyle = StyleSheet.create({
links: {
marginLeft: 12,
marginRight: 12,
- marginBottom: 12
+ marginBottom: 18
},
link: {
color: Colors.LbryGreen,
@@ -44,6 +44,13 @@ const aboutStyle = StyleSheet.create({
col: {
alignSelf: 'stretch'
},
+ socialTitle: {
+ fontFamily: 'Metropolis-Regular',
+ marginLeft: 12,
+ marginRight: 12,
+ marginBottom: 8,
+ fontSize: 20
+ },
releaseInfoTitle: {
fontFamily: 'Metropolis-Regular',
marginLeft: 12,
diff --git a/src/main/java/io/lbry/browser/reactmodules/UtilityModule.java b/src/main/java/io/lbry/browser/reactmodules/UtilityModule.java
index e3804aa2..083d8c87 100644
--- a/src/main/java/io/lbry/browser/reactmodules/UtilityModule.java
+++ b/src/main/java/io/lbry/browser/reactmodules/UtilityModule.java
@@ -2,7 +2,6 @@ package io.lbry.browser.reactmodules;
import android.app.Activity;
import android.content.Context;
-import android.view.View;
import android.view.WindowManager;
import com.facebook.react.bridge.ReactApplicationContext;
@@ -24,51 +23,29 @@ public class UtilityModule extends ReactContextBaseJavaModule {
@ReactMethod
public void keepAwakeOn() {
- final Activity activity = getCurrentActivity();
+ final Activity activity = getCurrentActivity();
- if (activity != null) {
- activity.runOnUiThread(new Runnable() {
- @Override
- public void run() {
- activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
- }
- });
- }
+ if (activity != null) {
+ activity.runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+ }
+ });
+ }
}
@ReactMethod
public void keepAwakeOff() {
- final Activity activity = getCurrentActivity();
+ final Activity activity = getCurrentActivity();
- if (activity != null) {
- activity.runOnUiThread(new Runnable() {
- @Override
- public void run() {
- activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
- }
- });
- }
- }
-
- @ReactMethod
- public void hideNavigationBar() {
- if (context != null && context instanceof Activity) {
- Activity activity = (Activity) context;
- View decorView = activity.getWindow().getDecorView();
- decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_HIDE_NAVIGATION |
- View.SYSTEM_UI_FLAG_IMMERSIVE |
- View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
- View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
- }
- }
-
- @ReactMethod
- public void showNavigationBar() {
- if (context != null && context instanceof Activity) {
- Activity activity = (Activity) context;
- View decorView = activity.getWindow().getDecorView();
- decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE |
- View.SYSTEM_UI_FLAG_VISIBLE);
- }
+ if (activity != null) {
+ activity.runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+ }
+ });
+ }
}
}