mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 12:53:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

#2192 scroll issue resolved (#2290)

Browse source
This commit is contained in:
vanshikaarora 2019-01-13 16:00:33 +05:30 • committed by Vivek Maskara
parent 28bfb04f0c
commit 1b7b909107
2 changed files with 162 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

48
app/src/main/res/layout/activity_about.xml
View file

@ -3,26 +3,35 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/drawer_layout" android:id="@+id/drawer_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:orientation="vertical">
<ScrollView <LinearLayout
android:layout_width="match_parent" android:id="@+id/toolbarLayout"
android:layout_height="wrap_content"> android:layout_width="wrap_content"
android:layout_height="?attr/actionBarSize">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<include <include
android:id="@+id/toolbar" android:id="@+id/toolbar"
layout="@layout/toolbar" layout="@layout/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="?attr/actionBarSize" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="?attr/actionBarSize"
android:layout_below="@id/toolbarLayout">
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_below="@id/toolbar"
android:layout_marginEnd="@dimen/activity_margin_horizontal" android:layout_marginEnd="@dimen/activity_margin_horizontal"
android:layout_marginLeft="@dimen/activity_margin_horizontal" android:layout_marginLeft="@dimen/activity_margin_horizontal"
android:layout_marginRight="@dimen/activity_margin_horizontal" android:layout_marginRight="@dimen/activity_margin_horizontal"
@ -46,8 +55,7 @@
<TextView <TextView
android:id="@+id/about_version" android:id="@+id/about_version"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content" />
android:textIsSelectable="true"/>
<fr.free.nrw.commons.ui.widget.HtmlTextView <fr.free.nrw.commons.ui.widget.HtmlTextView
android:id="@+id/about_license" android:id="@+id/about_license"
@ -111,7 +119,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/standard_gap" android:layout_marginTop="@dimen/standard_gap"
android:gravity="center" android:gravity="center"
android:textColor="?attr/colorAccent" android:textColor="@color/primaryColor"
/> />
<TextView <TextView
@ -120,7 +128,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/standard_gap" android:layout_marginTop="@dimen/standard_gap"
android:textColor="?attr/colorAccent" android:textColor="@color/primaryColor"
android:gravity="center" android:gravity="center"
/> />
@ -129,7 +137,7 @@
style="?android:textAppearanceSmall" style="?android:textAppearanceSmall"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="?attr/colorAccent" android:textColor="@color/primaryColor"
android:layout_marginTop="@dimen/standard_gap" android:layout_marginTop="@dimen/standard_gap"
android:gravity="center" android:gravity="center"
/> />
@ -139,7 +147,7 @@
style="?android:textAppearanceSmall" style="?android:textAppearanceSmall"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="?attr/colorAccent" android:textColor="@color/primaryColor"
android:layout_marginTop="@dimen/standard_gap" android:layout_marginTop="@dimen/standard_gap"
android:gravity="center" android:gravity="center"
/> />
@ -149,15 +157,15 @@
style="?android:textAppearanceSmall" style="?android:textAppearanceSmall"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="?attr/colorAccent" android:textColor="@color/primaryColor"
android:layout_marginTop="@dimen/standard_gap" android:layout_marginTop="@dimen/standard_gap"
android:layout_marginBottom="@dimen/standard_gap"
android:gravity="center" android:gravity="center"
/> />
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
</ScrollView> </ScrollView>
</LinearLayout>
<android.support.design.widget.NavigationView <android.support.design.widget.NavigationView
android:id="@+id/navigation_view" android:id="@+id/navigation_view"

23
app/src/main/res/layout/activity_settings.xml
View file

@ -4,17 +4,24 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/drawer_layout" android:id="@+id/drawer_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout <LinearLayout
android:layout_width="match_parent" android:id="@+id/toolbarLayout"
android:layout_height="match_parent"> android:layout_width="wrap_content"
android:layout_height="?attr/actionBarSize">
<include <include
android:id="@+id/toolbar" android:id="@+id/toolbar"
layout="@layout/toolbar" layout="@layout/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="?attr/actionBarSize" />
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/toolbarLayout"
android:layout_marginTop="?attr/actionBarSize">
<fragment <fragment
android:id="@+id/settingsFragment" android:id="@+id/settingsFragment"
@ -22,7 +29,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:layout="@xml/preferences" tools:layout="@xml/preferences"
android:layout_below="@id/toolbar"/> />
</RelativeLayout> </RelativeLayout>
<android.support.design.widget.NavigationView <android.support.design.widget.NavigationView