Fix layout scroll and landscape for tablet

app/src/main/res/layout/activity_about.xml

@@ -29,17 +29,23 @@
         layout="@layout/toolbar_default"
         app:layout_constraintTop_toTopOf="parent"/>
 
-    <ScrollView
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
+    <android.support.v4.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
         app:layout_constraintTop_toBottomOf="@id/toolbar"
-        app:layout_constraintWidth_percent="@dimen/content_percent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent">
+        app:layout_constraintBottom_toTopOf="@+id/disclaimer">
+
+        <android.support.constraint.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
             <LinearLayout
-            android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                app:layout_constraintWidth_percent="@dimen/content_percent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
                 android:isScrollContainer="true"
                 android:orientation="vertical"
                 android:paddingBottom="16dp"
@@ -60,7 +66,7 @@
                         android:layout_gravity="top"
                         android:layout_marginRight="10dp"
                         android:layout_marginEnd="10dp"
-                    android:src="@mipmap/ic_launcher" />
+                        android:src="@mipmap/ic_launcher"/>
 
                     <LinearLayout
                         android:layout_width="wrap_content"
@@ -74,19 +80,19 @@
                             android:layout_height="wrap_content"
                             android:text="@string/app_name"
                             android:textSize="18sp"
-                        android:textStyle="bold" />
+                            android:textStyle="bold"/>
 
                         <TextView
                             android:id="@+id/activity_about_version"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                        android:textAppearance="@android:style/TextAppearance.Small" />
+                            android:textAppearance="@android:style/TextAppearance.Small"/>
 
                         <TextView
                             android:id="@+id/activity_about_build"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                        android:textAppearance="@android:style/TextAppearance.Small" />
+                            android:textAppearance="@android:style/TextAppearance.Small"/>
                     </LinearLayout>
                 </RelativeLayout>
 
@@ -110,7 +116,7 @@
                     android:layout_marginLeft="18dp"
                     android:layout_marginStart="18dp"
                     android:autoLink="web"
-                android:text="@string/homepage" />
+                    android:text="@string/homepage"/>
 
                 <TextView android:id="@+id/feedback"
                           android:layout_width="wrap_content"
@@ -126,7 +132,8 @@
                           android:autoLink="web"/>
 
             </LinearLayout>
-    </ScrollView>
+        </android.support.constraint.ConstraintLayout>
+    </android.support.v4.widget.NestedScrollView>
 
     <TextView
         android:id="@+id/disclaimer"

app/src/main/res/layout/activity_entry.xml

@@ -71,6 +71,7 @@
         </android.support.design.widget.CollapsingToolbarLayout>
     </android.support.design.widget.AppBarLayout>
 
+
     <android.support.v4.widget.NestedScrollView
         android:id="@+id/entry_scroll"
         android:layout_width="match_parent"
@@ -78,10 +79,18 @@
         android:scrollbarStyle="insideOverlay"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
+        <android.support.constraint.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
             <com.kunzisoft.keepass.view.EntryContentsView
                 android:id="@+id/entry_contents"
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"/>
+                android:layout_height="match_parent"
+                android:layout_width="0dp"
+                app:layout_constraintWidth_percent="@dimen/content_percent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"/>
+        </android.support.constraint.ConstraintLayout>
 
     </android.support.v4.widget.NestedScrollView>
 

app/src/main/res/layout/activity_entry_edit.xml

@@ -17,7 +17,8 @@
   You should have received a copy of the GNU General Public License
   along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 -->
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.constraint.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -34,18 +35,26 @@
         android:id="@+id/entry_edit_scroll"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:fillViewport="true"
-        android:scrollbars="none"
-        app:layout_constraintWidth_percent="@dimen/content_percent"
+        app:layout_constraintTop_toBottomOf="@+id/toolbar"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/toolbar"
-        app:layout_constraintBottom_toBottomOf="parent">
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:fillViewport="true"
+        android:scrollbars="none">
+
+        <android.support.constraint.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
             <com.kunzisoft.keepass.view.EntryEditContentsView
                 android:id="@+id/entry_edit_contents"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                app:layout_constraintWidth_percent="@dimen/content_percent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"/>
+        </android.support.constraint.ConstraintLayout>
 
     </ScrollView>
 

app/src/main/res/layout/activity_group.xml

@@ -113,18 +113,11 @@
                 android:gravity="center_horizontal"
                 android:background="?attr/colorAccent"
                 android:text="@string/selection_mode"/>
-            <android.support.constraint.ConstraintLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="?android:attr/windowBackground">
             <FrameLayout
                 android:id="@+id/nodes_list_fragment_container"
-                    android:layout_width="0dp"
+                android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                    app:layout_constraintWidth_percent="@dimen/content_percent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent" />
-            </android.support.constraint.ConstraintLayout>
+                android:background="?android:attr/windowBackground" />
         </LinearLayout>
 
         <com.kunzisoft.keepass.view.AddNodeButtonView

app/src/main/res/layout/item_list_nodes_entry.xml

@@ -17,12 +17,20 @@
   You should have received a copy of the GNU General Public License
   along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 -->
-<RelativeLayout
+<android.support.constraint.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/node_container"
     android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+    <RelativeLayout
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
+        app:layout_constraintWidth_percent="@dimen/content_percent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         android:background="?android:attr/selectableItemBackground" >
         <android.support.v7.widget.AppCompatImageView
             android:id="@+id/node_icon"
@@ -65,5 +73,5 @@
                 android:singleLine="true"
                 style="@style/KeepassDXStyle.TextAppearance.Secondary" /> <!-- style override -->
         </LinearLayout>
-
-</RelativeLayout>
+    </RelativeLayout>
+</android.support.constraint.ConstraintLayout>

app/src/main/res/layout/item_list_nodes_group.xml

@@ -17,12 +17,20 @@
   You should have received a copy of the GNU General Public License
   along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 -->
-<RelativeLayout
+<android.support.constraint.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/node_container"
     android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+    <RelativeLayout
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
+        app:layout_constraintWidth_percent="@dimen/content_percent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         android:background="?android:attr/selectableItemBackground" >
         <android.support.v7.widget.AppCompatImageView
             android:id="@+id/group_arrow"
@@ -78,4 +86,5 @@
                 android:singleLine="true"
                 style="@style/KeepassDXStyle.TextAppearance.Secondary" /> <!-- style override -->
         </LinearLayout>
-</RelativeLayout>
+    </RelativeLayout>
+</android.support.constraint.ConstraintLayout>