Skip to content

Commit 2fe374a

Browse files
author
Vivek Maskara
authored
Merge pull request commons-app#1199 from knight-shade/Fixes-#1177
Add ScrollView in About activity.
2 parents 3f490ff + 660fb4a commit 2fe374a

File tree

1 file changed

+116
-118
lines changed

1 file changed

+116
-118
lines changed

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

Lines changed: 116 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -5,144 +5,142 @@
55
android:layout_width="match_parent"
66
android:layout_height="match_parent">
77

8-
<RelativeLayout
8+
<ScrollView
99
android:layout_width="match_parent"
10-
android:layout_height="match_parent">
10+
android:layout_height="wrap_content">
1111

12-
<include
13-
android:id="@+id/toolbar"
14-
layout="@layout/toolbar"
12+
<RelativeLayout
1513
android:layout_width="match_parent"
16-
android:layout_height="wrap_content" />
14+
android:layout_height="wrap_content">
1715

18-
<LinearLayout
19-
android:layout_width="match_parent"
20-
android:layout_height="match_parent"
21-
android:layout_below="@id/toolbar"
22-
android:layout_marginLeft="@dimen/activity_margin_horizontal"
23-
android:layout_marginStart="@dimen/activity_margin_horizontal"
24-
android:layout_marginRight="@dimen/activity_margin_horizontal"
25-
android:layout_marginEnd="@dimen/activity_margin_horizontal"
26-
android:gravity="center"
27-
android:orientation="vertical">
28-
29-
<ImageView
30-
android:layout_width="wrap_content"
31-
android:layout_height="wrap_content"
32-
android:src="@drawable/ic_launcher"
33-
android:contentDescription= "@string/commons_logo"
34-
/>
35-
36-
<TextView
37-
style="?android:textAppearanceLarge"
38-
android:layout_width="wrap_content"
39-
android:layout_height="wrap_content"
40-
android:text="@string/app_name" />
41-
42-
<TextView
43-
android:id="@+id/about_version"
44-
android:layout_width="wrap_content"
16+
<include
17+
android:id="@+id/toolbar"
18+
layout="@layout/toolbar"
19+
android:layout_width="match_parent"
4520
android:layout_height="wrap_content" />
4621

47-
<fr.free.nrw.commons.ui.widget.HtmlTextView
48-
android:id="@+id/about_license"
49-
style="?android:textAppearanceSmall"
50-
android:layout_width="wrap_content"
51-
android:layout_height="wrap_content"
52-
android:layout_marginTop="@dimen/standard_gap"
53-
android:gravity="center"
54-
android:text="@string/about_license" />
55-
56-
<fr.free.nrw.commons.ui.widget.HtmlTextView
57-
android:id="@+id/about_improve"
58-
style="?android:textAppearanceSmall"
59-
android:layout_width="wrap_content"
60-
android:layout_height="wrap_content"
61-
android:layout_marginTop="@dimen/small_gap"
62-
android:gravity="center"
63-
android:text="@string/about_improve" />
64-
65-
6622
<LinearLayout
6723
android:layout_width="match_parent"
68-
android:layout_height="wrap_content"
69-
android:gravity="center"
70-
android:orientation="horizontal"
24+
android:layout_height="match_parent"
25+
android:layout_below="@id/toolbar"
26+
android:layout_marginEnd="@dimen/activity_margin_horizontal"
7127
android:layout_marginLeft="@dimen/activity_margin_horizontal"
72-
android:layout_marginStart="@dimen/activity_margin_horizontal"
7328
android:layout_marginRight="@dimen/activity_margin_horizontal"
74-
android:layout_marginTop="@dimen/activity_margin_horizontal"
75-
android:layout_marginEnd="@dimen/activity_margin_horizontal"
76-
>
77-
78-
<ImageView
79-
android:id="@+id/website_launch_icon"
80-
android:layout_width="@dimen/overflow_icon_dimen"
81-
android:layout_height="@dimen/overflow_icon_dimen"
82-
app:srcCompat="@drawable/ic_action_website"
83-
android:contentDescription= "@string/commons_website"
84-
android:layout_margin="@dimen/activity_margin_horizontal"
85-
/>
86-
87-
<ImageView
88-
android:id="@+id/facebook_launch_icon"
89-
android:layout_width="@dimen/overflow_icon_dimen"
90-
android:layout_height="@dimen/overflow_icon_dimen"
91-
app:srcCompat="@drawable/ic_action_facebook"
92-
android:contentDescription= "@string/commons_facebook"
93-
android:layout_margin="@dimen/activity_margin_horizontal"
94-
/>
29+
android:layout_marginStart="@dimen/activity_margin_horizontal"
30+
android:layout_marginTop="@dimen/activity_margin_vertical"
31+
android:gravity="center"
32+
android:orientation="vertical">
9533

9634
<ImageView
97-
android:id="@+id/github_launch_icon"
98-
android:layout_width="@dimen/overflow_icon_dimen"
99-
android:layout_height="@dimen/overflow_icon_dimen"
100-
app:srcCompat="@drawable/ic_action_github"
101-
android:contentDescription= "@string/commons_github"
102-
android:layout_margin="@dimen/activity_margin_horizontal"
103-
/>
35+
android:layout_width="wrap_content"
36+
android:layout_height="wrap_content"
37+
android:contentDescription="@string/commons_logo"
38+
android:src="@drawable/ic_launcher" />
39+
40+
<TextView
41+
style="?android:textAppearanceLarge"
42+
android:layout_width="wrap_content"
43+
android:layout_height="wrap_content"
44+
android:text="@string/app_name" />
45+
46+
<TextView
47+
android:id="@+id/about_version"
48+
android:layout_width="wrap_content"
49+
android:layout_height="wrap_content" />
50+
51+
<fr.free.nrw.commons.ui.widget.HtmlTextView
52+
android:id="@+id/about_license"
53+
style="?android:textAppearanceSmall"
54+
android:layout_width="wrap_content"
55+
android:layout_height="wrap_content"
56+
android:layout_marginTop="@dimen/standard_gap"
57+
android:gravity="center"
58+
android:text="@string/about_license" />
59+
60+
<fr.free.nrw.commons.ui.widget.HtmlTextView
61+
android:id="@+id/about_improve"
62+
style="?android:textAppearanceSmall"
63+
android:layout_width="wrap_content"
64+
android:layout_height="wrap_content"
65+
android:layout_marginTop="@dimen/small_gap"
66+
android:gravity="center"
67+
android:text="@string/about_improve" />
68+
69+
70+
<LinearLayout
71+
android:layout_width="match_parent"
72+
android:layout_height="wrap_content"
73+
android:layout_marginEnd="@dimen/activity_margin_horizontal"
74+
android:layout_marginLeft="@dimen/activity_margin_horizontal"
75+
android:layout_marginRight="@dimen/activity_margin_horizontal"
76+
android:layout_marginStart="@dimen/activity_margin_horizontal"
77+
android:layout_marginTop="@dimen/activity_margin_horizontal"
78+
android:gravity="center"
79+
android:orientation="horizontal">
80+
81+
<ImageView
82+
android:id="@+id/website_launch_icon"
83+
android:layout_width="@dimen/overflow_icon_dimen"
84+
android:layout_height="@dimen/overflow_icon_dimen"
85+
android:layout_margin="@dimen/activity_margin_horizontal"
86+
android:contentDescription="@string/commons_website"
87+
app:srcCompat="@drawable/ic_action_website" />
88+
89+
<ImageView
90+
android:id="@+id/facebook_launch_icon"
91+
android:layout_width="@dimen/overflow_icon_dimen"
92+
android:layout_height="@dimen/overflow_icon_dimen"
93+
android:layout_margin="@dimen/activity_margin_horizontal"
94+
android:contentDescription="@string/commons_facebook"
95+
app:srcCompat="@drawable/ic_action_facebook" />
96+
97+
<ImageView
98+
android:id="@+id/github_launch_icon"
99+
android:layout_width="@dimen/overflow_icon_dimen"
100+
android:layout_height="@dimen/overflow_icon_dimen"
101+
android:layout_margin="@dimen/activity_margin_horizontal"
102+
android:contentDescription="@string/commons_github"
103+
app:srcCompat="@drawable/ic_action_github" />
104+
105+
</LinearLayout>
106+
107+
<fr.free.nrw.commons.ui.widget.HtmlTextView
108+
android:id="@+id/about_privacy_policy"
109+
style="?android:textAppearanceSmall"
110+
android:layout_width="wrap_content"
111+
android:layout_height="wrap_content"
112+
android:layout_marginTop="@dimen/standard_gap"
113+
android:gravity="center"
114+
android:text="@string/about_privacy_policy" />
115+
116+
<fr.free.nrw.commons.ui.widget.HtmlTextView
117+
android:id="@+id/about_credits"
118+
style="?android:textAppearanceSmall"
119+
android:layout_width="wrap_content"
120+
android:layout_height="wrap_content"
121+
android:layout_marginTop="@dimen/standard_gap"
122+
android:gravity="center"
123+
android:text="@string/about_credits" />
124+
125+
<TextView
126+
android:id="@+id/about_uploads_to"
127+
style="?android:textAppearanceSmall"
128+
android:layout_width="wrap_content"
129+
android:layout_height="wrap_content"
130+
android:layout_marginTop="@dimen/large_gap"
131+
android:alpha="0.2"
132+
android:gravity="center" />
104133

105134
</LinearLayout>
106-
107-
<TextView
108-
android:id="@+id/about_privacy_policy"
109-
style="?android:textAppearanceSmall"
110-
android:layout_width="wrap_content"
111-
android:layout_height="wrap_content"
112-
android:layout_marginTop="@dimen/standard_gap"
113-
android:gravity="center"
114-
android:textColor="@color/primaryColor"
115-
android:text="@string/about_privacy_policy" />
116-
117-
<TextView
118-
android:id="@+id/about_credits"
119-
style="?android:textAppearanceSmall"
120-
android:layout_width="wrap_content"
121-
android:layout_height="wrap_content"
122-
android:layout_marginTop="@dimen/standard_gap"
123-
android:gravity="center"
124-
android:textColor="@color/primaryColor"
125-
android:text="@string/about_credits"
126-
/>
127-
128-
<TextView
129-
android:id="@+id/about_uploads_to"
130-
style="?android:textAppearanceSmall"
131-
android:layout_width="wrap_content"
132-
android:layout_height="wrap_content"
133-
android:layout_marginTop="@dimen/large_gap"
134-
android:alpha="0.2"
135-
android:gravity="center" />
136-
137-
</LinearLayout>
138-
</RelativeLayout>
135+
</RelativeLayout>
136+
</ScrollView>
139137

140138
<android.support.design.widget.NavigationView
141139
android:id="@+id/navigation_view"
142140
android:layout_width="wrap_content"
143141
android:layout_height="match_parent"
144142
android:layout_gravity="start"
145143
app:headerLayout="@layout/drawer_header"
146-
app:menu="@menu/drawer"/>
144+
app:menu="@menu/drawer" />
147145

148146
</android.support.v4.widget.DrawerLayout>

0 commit comments

Comments
 (0)