Fix non-scrollable toolbar in AboutActivity
This commit is contained in:
parent
545caebc32
commit
0f7e5ee3ee
@ -50,7 +50,7 @@ public class AboutFragment extends BaseFragment {
|
|||||||
TextView translatorsView;
|
TextView translatorsView;
|
||||||
|
|
||||||
public AboutFragment() {
|
public AboutFragment() {
|
||||||
super(R.layout.about_fragment);
|
super(R.layout.fragment_about);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -41,7 +41,7 @@ public class ReleaseNotesFragment extends BaseFragment {
|
|||||||
TextView text;
|
TextView text;
|
||||||
|
|
||||||
public ReleaseNotesFragment() {
|
public ReleaseNotesFragment() {
|
||||||
super(R.layout.release_notes_fragment);
|
super(R.layout.fragment_release_notes);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -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>
|
|
69
app/src/main/res/layout/fragment_about.xml
Normal file
69
app/src/main/res/layout/fragment_about.xml
Normal file
@ -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>
|
@ -22,16 +22,16 @@
|
|||||||
~ Site: http://se.solovyev.org
|
~ 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_width="match_parent"
|
||||||
a:layout_height="match_parent"
|
a:layout_height="match_parent"
|
||||||
a:orientation="vertical">
|
app:layout_behavior="@string/appbar_scrolling_view_behavior">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
a:id="@+id/releasenotes_text"
|
a:id="@+id/releasenotes_text"
|
||||||
style="@style/CppText.About"
|
style="@style/CppText.About"
|
||||||
a:layout_width="match_parent"
|
a:layout_width="match_parent"
|
||||||
a:layout_height="match_parent"
|
a:layout_height="wrap_content" />
|
||||||
a:scrollbars="vertical" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
</android.support.v4.widget.NestedScrollView>
|
Loading…
Reference in New Issue
Block a user