From b7989b4b9f72c8b6933a9c4ddbeef07d9b7c9797 Mon Sep 17 00:00:00 2001
From: serso <se.solovyev@gmail.com>
Date: Sat, 30 Apr 2016 10:07:07 +0200
Subject: [PATCH] Fix non-scrollable toolbar in AboutActivity

---
 .../calculator/about/AboutFragment.java       |  2 +-
 .../about/ReleaseNotesFragment.java           |  2 +-
 app/src/main/res/layout/about_fragment.xml    | 76 -------------------
 app/src/main/res/layout/fragment_about.xml    | 69 +++++++++++++++++
 ...ragment.xml => fragment_release_notes.xml} | 10 +--
 5 files changed, 76 insertions(+), 83 deletions(-)
 delete mode 100644 app/src/main/res/layout/about_fragment.xml
 create mode 100644 app/src/main/res/layout/fragment_about.xml
 rename app/src/main/res/layout/{release_notes_fragment.xml => fragment_release_notes.xml} (77%)

diff --git a/app/src/main/java/org/solovyev/android/calculator/about/AboutFragment.java b/app/src/main/java/org/solovyev/android/calculator/about/AboutFragment.java
index 33e4e62b..66a8243b 100644
--- a/app/src/main/java/org/solovyev/android/calculator/about/AboutFragment.java
+++ b/app/src/main/java/org/solovyev/android/calculator/about/AboutFragment.java
@@ -50,7 +50,7 @@ public class AboutFragment extends BaseFragment {
     TextView translatorsView;
 
     public AboutFragment() {
-        super(R.layout.about_fragment);
+        super(R.layout.fragment_about);
     }
 
     @Override
diff --git a/app/src/main/java/org/solovyev/android/calculator/about/ReleaseNotesFragment.java b/app/src/main/java/org/solovyev/android/calculator/about/ReleaseNotesFragment.java
index 9cfddf2a..b493a3c0 100644
--- a/app/src/main/java/org/solovyev/android/calculator/about/ReleaseNotesFragment.java
+++ b/app/src/main/java/org/solovyev/android/calculator/about/ReleaseNotesFragment.java
@@ -41,7 +41,7 @@ public class ReleaseNotesFragment extends BaseFragment {
     TextView text;
 
     public ReleaseNotesFragment() {
-        super(R.layout.release_notes_fragment);
+        super(R.layout.fragment_release_notes);
     }
 
     @Override
diff --git a/app/src/main/res/layout/about_fragment.xml b/app/src/main/res/layout/about_fragment.xml
deleted file mode 100644
index 4384cd65..00000000
--- a/app/src/main/res/layout/about_fragment.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright 2013 serso aka se.solovyev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ Contact details
-  ~
-  ~ Email: se.solovyev@gmail.com
-  ~ Site:  http://se.solovyev.org
-  -->
-
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
-    a:layout_width="fill_parent"
-    a:layout_height="fill_parent"
-    a:orientation="vertical">
-
-    <ImageView
-        a:id="@+id/about_image"
-        a:layout_width="200dp"
-        a:layout_height="200dp"
-        a:layout_gravity="center"
-        a:layout_weight="1"
-        a:padding="6dp"
-        a:scaleType="center"
-        a:src="@drawable/logo_wizard" />
-
-    <ScrollView
-        a:layout_width="fill_parent"
-        a:layout_height="fill_parent"
-        a:layout_weight="1">
-
-        <LinearLayout
-            a:layout_width="fill_parent"
-            a:layout_height="wrap_content"
-            a:orientation="vertical">
-
-            <TextView
-                a:id="@+id/about_text"
-                style="@style/CppText.About"
-                a:layout_width="match_parent"
-                a:layout_height="match_parent"
-                a:text="@string/c_about_content" />
-
-
-            <TextView
-                a:id="@+id/about_translators_label"
-                style="@style/CppText.About"
-                a:layout_width="match_parent"
-                a:layout_height="wrap_content"
-                a:paddingBottom="0dp"
-                a:text="@string/cpp_translators_text" />
-
-            <TextView
-                a:id="@+id/about_translators"
-                style="@style/CppText.About"
-                a:layout_width="match_parent"
-                a:layout_height="wrap_content"
-                a:paddingTop="0dp"
-                a:text="@string/cpp_translators_list" />
-
-        </LinearLayout>
-    </ScrollView>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
new file mode 100644
index 00000000..a9e711ba
--- /dev/null
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 serso aka se.solovyev
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Contact details
+  ~
+  ~ Email: se.solovyev@gmail.com
+  ~ Site:  http://se.solovyev.org
+  -->
+
+<android.support.v4.widget.NestedScrollView xmlns:a="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    a:layout_width="match_parent"
+    a:layout_height="match_parent"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+    <LinearLayout
+        a:layout_width="match_parent"
+        a:layout_height="wrap_content"
+        a:orientation="vertical">
+
+        <ImageView
+            a:id="@+id/about_image"
+            a:layout_width="150dp"
+            a:layout_height="150dp"
+            a:layout_gravity="center"
+            a:padding="15dp"
+            a:scaleType="fitCenter"
+            a:src="@drawable/logo_wizard" />
+
+        <TextView
+            a:id="@+id/about_text"
+            style="@style/CppText.About"
+            a:layout_width="match_parent"
+            a:layout_height="wrap_content"
+            a:text="@string/c_about_content" />
+
+        <TextView
+            a:id="@+id/about_translators_label"
+            style="@style/CppText.About"
+            a:layout_width="match_parent"
+            a:layout_height="wrap_content"
+            a:paddingBottom="0dp"
+            a:text="@string/cpp_translators_text" />
+
+        <TextView
+            a:id="@+id/about_translators"
+            style="@style/CppText.About"
+            a:layout_width="match_parent"
+            a:layout_height="wrap_content"
+            a:paddingTop="0dp"
+            a:text="@string/cpp_translators_list" />
+
+    </LinearLayout>
+</android.support.v4.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/release_notes_fragment.xml b/app/src/main/res/layout/fragment_release_notes.xml
similarity index 77%
rename from app/src/main/res/layout/release_notes_fragment.xml
rename to app/src/main/res/layout/fragment_release_notes.xml
index 73ee4e06..5173b6f0 100644
--- a/app/src/main/res/layout/release_notes_fragment.xml
+++ b/app/src/main/res/layout/fragment_release_notes.xml
@@ -22,16 +22,16 @@
   ~ Site:  http://se.solovyev.org
   -->
 
-<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
+<android.support.v4.widget.NestedScrollView xmlns:a="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     a:layout_width="match_parent"
     a:layout_height="match_parent"
-    a:orientation="vertical">
+    app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
     <TextView
         a:id="@+id/releasenotes_text"
         style="@style/CppText.About"
         a:layout_width="match_parent"
-        a:layout_height="match_parent"
-        a:scrollbars="vertical" />
+        a:layout_height="wrap_content" />
 
-</LinearLayout>
\ No newline at end of file
+</android.support.v4.widget.NestedScrollView>
\ No newline at end of file