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

Merge pull request #1199 from knight-shade/Fixes-#1177

Browse source 
Add ScrollView in About activity.
This commit is contained in:
Vivek Maskara 2018-02-27 05:12:19 +05:30 • committed by GitHub
commit 2fe374a2bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 115 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,9 +5,13 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="wrap_content">
<include <include
android:id="@+id/toolbar" android:id="@+id/toolbar"
@ -19,19 +23,19 @@
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_below="@id/toolbar"
android:layout_marginLeft="@dimen/activity_margin_horizontal"
android:layout_marginStart="@dimen/activity_margin_horizontal"
android:layout_marginRight="@dimen/activity_margin_horizontal"
android:layout_marginEnd="@dimen/activity_margin_horizontal" android:layout_marginEnd="@dimen/activity_margin_horizontal"
android:layout_marginLeft="@dimen/activity_margin_horizontal"
android:layout_marginRight="@dimen/activity_margin_horizontal"
android:layout_marginStart="@dimen/activity_margin_horizontal"
android:layout_marginTop="@dimen/activity_margin_vertical"
android:gravity="center" android:gravity="center"
android:orientation="vertical"> android:orientation="vertical">
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/ic_launcher" android:contentDescription="@string/commons_logo"
android:contentDescription= "@string/commons_logo" android:src="@drawable/ic_launcher" />
/>
<TextView <TextView
style="?android:textAppearanceLarge" style="?android:textAppearanceLarge"
@ -66,64 +70,57 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal"
android:layout_marginLeft="@dimen/activity_margin_horizontal"
android:layout_marginStart="@dimen/activity_margin_horizontal"
android:layout_marginRight="@dimen/activity_margin_horizontal"
android:layout_marginTop="@dimen/activity_margin_horizontal"
android:layout_marginEnd="@dimen/activity_margin_horizontal" android:layout_marginEnd="@dimen/activity_margin_horizontal"
> android:layout_marginLeft="@dimen/activity_margin_horizontal"
android:layout_marginRight="@dimen/activity_margin_horizontal"
android:layout_marginStart="@dimen/activity_margin_horizontal"
android:layout_marginTop="@dimen/activity_margin_horizontal"
android:gravity="center"
android:orientation="horizontal">
<ImageView <ImageView
android:id="@+id/website_launch_icon" android:id="@+id/website_launch_icon"
android:layout_width="@dimen/overflow_icon_dimen" android:layout_width="@dimen/overflow_icon_dimen"
android:layout_height="@dimen/overflow_icon_dimen" android:layout_height="@dimen/overflow_icon_dimen"
app:srcCompat="@drawable/ic_action_website"
android:contentDescription= "@string/commons_website"
android:layout_margin="@dimen/activity_margin_horizontal" android:layout_margin="@dimen/activity_margin_horizontal"
/> android:contentDescription="@string/commons_website"
app:srcCompat="@drawable/ic_action_website" />
<ImageView <ImageView
android:id="@+id/facebook_launch_icon" android:id="@+id/facebook_launch_icon"
android:layout_width="@dimen/overflow_icon_dimen" android:layout_width="@dimen/overflow_icon_dimen"
android:layout_height="@dimen/overflow_icon_dimen" android:layout_height="@dimen/overflow_icon_dimen"
app:srcCompat="@drawable/ic_action_facebook"
android:contentDescription= "@string/commons_facebook"
android:layout_margin="@dimen/activity_margin_horizontal" android:layout_margin="@dimen/activity_margin_horizontal"
/> android:contentDescription="@string/commons_facebook"
app:srcCompat="@drawable/ic_action_facebook" />
<ImageView <ImageView
android:id="@+id/github_launch_icon" android:id="@+id/github_launch_icon"
android:layout_width="@dimen/overflow_icon_dimen" android:layout_width="@dimen/overflow_icon_dimen"
android:layout_height="@dimen/overflow_icon_dimen" android:layout_height="@dimen/overflow_icon_dimen"
app:srcCompat="@drawable/ic_action_github"
android:contentDescription= "@string/commons_github"
android:layout_margin="@dimen/activity_margin_horizontal" android:layout_margin="@dimen/activity_margin_horizontal"
/> android:contentDescription="@string/commons_github"
app:srcCompat="@drawable/ic_action_github" />
</LinearLayout> </LinearLayout>
<TextView <fr.free.nrw.commons.ui.widget.HtmlTextView
android:id="@+id/about_privacy_policy" android:id="@+id/about_privacy_policy"
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:layout_marginTop="@dimen/standard_gap" android:layout_marginTop="@dimen/standard_gap"
android:gravity="center" android:gravity="center"
android:textColor="@color/primaryColor"
android:text="@string/about_privacy_policy" /> android:text="@string/about_privacy_policy" />
<TextView <fr.free.nrw.commons.ui.widget.HtmlTextView
android:id="@+id/about_credits" android:id="@+id/about_credits"
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:layout_marginTop="@dimen/standard_gap" android:layout_marginTop="@dimen/standard_gap"
android:gravity="center" android:gravity="center"
android:textColor="@color/primaryColor" android:text="@string/about_credits" />
android:text="@string/about_credits"
/>
<TextView <TextView
android:id="@+id/about_uploads_to" android:id="@+id/about_uploads_to"
@ -136,6 +133,7 @@
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
</ScrollView>
<android.support.design.widget.NavigationView <android.support.design.widget.NavigationView
android:id="@+id/navigation_view" android:id="@+id/navigation_view"
@ -143,6 +141,6 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="start" android:layout_gravity="start"
app:headerLayout="@layout/drawer_header" app:headerLayout="@layout/drawer_header"
app:menu="@menu/drawer"/> app:menu="@menu/drawer" />
</android.support.v4.widget.DrawerLayout> </android.support.v4.widget.DrawerLayout>