From c2e2b601a910364bb8d918fc636341161446116e Mon Sep 17 00:00:00 2001
From: Guillaume Vincent <guillaume@oslab.fr>
Date: Wed, 3 Nov 2021 18:20:31 +0100
Subject: [PATCH] Fix scroll issue

Fixes https://github.com/lesspass/lesspass/issues/664
---
 mobile/ios/LessPass.xcodeproj/project.pbxproj  |  4 ++--
 mobile/package.json                            |  2 +-
 mobile/src/auth/SignInScreen.js                |  6 +++---
 mobile/src/auth/SignUpScreen.js                |  6 +++---
 mobile/src/help/HelpScreen.js                  | 22 ++++++++++++----------
 mobile/src/password/PasswordGeneratorScreen.js |  5 +++--
 mobile/src/settings/SettingsScreen.js          |  4 ++--
 mobile/src/ui/Styles.js                        |  3 +--
 mobile/src/version.json                        |  2 +-
 9 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/mobile/ios/LessPass.xcodeproj/project.pbxproj b/mobile/ios/LessPass.xcodeproj/project.pbxproj
index 261dffb..ba3cb5f 100644
--- a/mobile/ios/LessPass.xcodeproj/project.pbxproj
+++ b/mobile/ios/LessPass.xcodeproj/project.pbxproj
@@ -355,7 +355,7 @@
 				);
 				INFOPLIST_FILE = LessPass/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 9.5.0;
+				MARKETING_VERSION = 9.5.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -384,7 +384,7 @@
 				DEVELOPMENT_TEAM = 5Y4MF2AT83;
 				INFOPLIST_FILE = LessPass/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 9.5.0;
+				MARKETING_VERSION = 9.5.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
diff --git a/mobile/package.json b/mobile/package.json
index 77522d5..abac758 100644
--- a/mobile/package.json
+++ b/mobile/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lesspass-mobile",
-  "version": "9.5.0",
+  "version": "9.5.1",
   "description": "LessPass mobile application",
   "license": "(MPL-2.0 OR GPL-3.0)",
   "author": "Guillaume Vincent <guillaume@oslab.fr>",
diff --git a/mobile/src/auth/SignInScreen.js b/mobile/src/auth/SignInScreen.js
index 7f5837b..9bb1603 100644
--- a/mobile/src/auth/SignInScreen.js
+++ b/mobile/src/auth/SignInScreen.js
@@ -3,7 +3,7 @@ import { connect } from "react-redux";
 import { isEmpty } from "lodash";
 import {
   KeyboardAvoidingView,
-  View,
+  ScrollView,
   Platform,
   TouchableWithoutFeedback,
   Keyboard,
@@ -36,7 +36,7 @@ export class SignInScreen extends Component {
         style={Styles.container}
       >
         <TouchableWithoutFeedback onPress={Keyboard.dismiss}>
-          <View style={Styles.innerContainer}>
+          <ScrollView contentContainerStyle={Styles.innerContainer}>
             <Title>Connect to Lesspass Database</Title>
             <TextInput
               mode="outlined"
@@ -90,7 +90,7 @@ export class SignInScreen extends Component {
             >
               Sign Up
             </Button>
-          </View>
+          </ScrollView>
         </TouchableWithoutFeedback>
       </KeyboardAvoidingView>
     );
diff --git a/mobile/src/auth/SignUpScreen.js b/mobile/src/auth/SignUpScreen.js
index 2c08ce2..6b31c43 100644
--- a/mobile/src/auth/SignUpScreen.js
+++ b/mobile/src/auth/SignUpScreen.js
@@ -2,7 +2,7 @@ import React, { Component } from "react";
 import { connect } from "react-redux";
 import {
   KeyboardAvoidingView,
-  View,
+  ScrollView,
   Platform,
   TouchableWithoutFeedback,
   Keyboard,
@@ -37,7 +37,7 @@ export class SignUpScreen extends Component {
         style={Styles.container}
       >
         <TouchableWithoutFeedback onPress={Keyboard.dismiss}>
-          <View style={Styles.innerContainer}>
+          <ScrollView contentContainerStyle={Styles.innerContainer}>
             <Title style={Styles.title}>Create an account</Title>
             <TextInput
               mode="outlined"
@@ -87,7 +87,7 @@ export class SignUpScreen extends Component {
             >
               Sign In
             </Button>
-          </View>
+          </ScrollView>
         </TouchableWithoutFeedback>
       </KeyboardAvoidingView>
     );
diff --git a/mobile/src/help/HelpScreen.js b/mobile/src/help/HelpScreen.js
index e05b938..a45538b 100644
--- a/mobile/src/help/HelpScreen.js
+++ b/mobile/src/help/HelpScreen.js
@@ -1,11 +1,11 @@
 import React from "react";
-import { ScrollView, Image, Linking } from "react-native";
+import { ScrollView, Image, Linking, View } from "react-native";
 import { Title, Subheading, Paragraph, Button } from "react-native-paper";
 import Styles from "../ui/Styles";
 
 export default function HelpScreen() {
   return (
-    <ScrollView style={Styles.innerContainer}>
+    <ScrollView contentContainerStyle={Styles.innerContainer}>
       <Title style={Styles.title}>Help</Title>
       <Subheading>How does it work?</Subheading>
       <Paragraph style={{ marginBottom: 20 }}>
@@ -26,13 +26,16 @@ export default function HelpScreen() {
         series of displayed emoticons).
       </Paragraph>
       <Subheading>Options</Subheading>
-      <Image
-        source={require("./options.png")}
-        style={{
-          width: 360,
-          height: 102,
-        }}
-      />
+      <View>
+        <Image
+          source={require("./options.png")}
+          style={{
+            width: null,
+            resizeMode: "contain",
+            height: 100,
+          }}
+        />
+      </View>
       <Paragraph style={{ marginBottom: 20 }}>
         Sometimes sites have specific password rules. For instance, some banks
         only accept passwords made of digits. LessPass lets you set parameters
@@ -77,7 +80,6 @@ export default function HelpScreen() {
         }}
         style={{
           marginTop: 10,
-          marginBottom: 60,
         }}
       >
         send us an email
diff --git a/mobile/src/password/PasswordGeneratorScreen.js b/mobile/src/password/PasswordGeneratorScreen.js
index 90b91d6..61e36a9 100644
--- a/mobile/src/password/PasswordGeneratorScreen.js
+++ b/mobile/src/password/PasswordGeneratorScreen.js
@@ -1,5 +1,6 @@
 import React, { useEffect, useState } from "react";
 import {
+  ScrollView,
   View,
   TouchableWithoutFeedback,
   KeyboardAvoidingView,
@@ -92,7 +93,7 @@ export default function PasswordGeneratorScreen() {
       style={Styles.container}
     >
       <TouchableWithoutFeedback onPress={Keyboard.dismiss}>
-        <View style={Styles.innerContainer}>
+        <ScrollView contentContainerStyle={Styles.innerContainer}>
           <TextInput
             mode="outlined"
             label="Site"
@@ -260,7 +261,7 @@ export default function PasswordGeneratorScreen() {
               </Text>
             </View>
           )}
-        </View>
+        </ScrollView>
       </TouchableWithoutFeedback>
       <Snackbar
         visible={copied}
diff --git a/mobile/src/settings/SettingsScreen.js b/mobile/src/settings/SettingsScreen.js
index 6685c54..04e259f 100644
--- a/mobile/src/settings/SettingsScreen.js
+++ b/mobile/src/settings/SettingsScreen.js
@@ -45,8 +45,8 @@ export class SettingsScreen extends Component {
       defaultCounter,
     } = settings;
     return (
-      <ScrollView style={Styles.container}>
-        <View style={Styles.innerContainer}>
+      <ScrollView>
+        <View style={{ padding: 15 }}>
           <Title>Settings</Title>
         </View>
         <List.Section title="LESSPASS DATABASE">
diff --git a/mobile/src/ui/Styles.js b/mobile/src/ui/Styles.js
index 3c23026..411abd1 100644
--- a/mobile/src/ui/Styles.js
+++ b/mobile/src/ui/Styles.js
@@ -7,8 +7,7 @@ export default StyleSheet.create({
   innerContainer: {
     paddingHorizontal: 15,
     paddingTop: 15,
-    marginBottom: 20,
-    flex: 1,
+    paddingBottom: 20,
   },
   title: {
     marginBottom: 10,
diff --git a/mobile/src/version.json b/mobile/src/version.json
index 1718789..11f15ec 100644
--- a/mobile/src/version.json
+++ b/mobile/src/version.json
@@ -1,3 +1,3 @@
 {
-  "version": "9.5.0"
+  "version": "9.5.1"
 }