Skip to content

Commit 3f490ff

Browse files
author
Vivek Maskara
authored
Merge pull request commons-app#1210 from gupta-meghna64/master
Formatted text in Tutorial pageviews
2 parents 88a4e50 + 68ac0db commit 3f490ff

File tree

7 files changed

+519
-49
lines changed

7 files changed

+519
-49
lines changed

‎app/src/main/res/layout-land/welcome_do_upload.xml‎

Lines changed: 78 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,16 +73,91 @@
7373
android:gravity="center_horizontal"
7474
android:textColor="@android:color/white"/>
7575

76-
<TextView
76+
<LinearLayout
77+
android:layout_width="wrap_content"
78+
android:layout_height="wrap_content"
79+
android:maxWidth="240dp"
80+
android:layout_gravity="center"
81+
android:orientation="horizontal">
82+
83+
<TextView
84+
android:layout_width="wrap_content"
85+
android:layout_height="wrap_content"
86+
android:text="@string/bullet"
87+
android:paddingRight="4dp"
88+
android:textSize="16sp"
89+
android:paddingTop="@dimen/standard_gap"
90+
android:textColor="@android:color/white"/>
91+
92+
<TextView
7793
android:layout_width="wrap_content"
7894
android:layout_height="wrap_content"
7995
android:maxWidth="240dp"
80-
android:text="@string/tutorial_2_subtext"
96+
android:text="@string/tutorial_2_subtext_1"
8197
android:layout_gravity="center"
8298
android:textAlignment="textStart"
8399
android:paddingTop="@dimen/standard_gap"
84100
android:gravity="start"
85101
android:textColor="@android:color/white"
86-
/>
102+
/>
103+
104+
</LinearLayout>
105+
106+
<LinearLayout
107+
android:layout_width="wrap_content"
108+
android:layout_height="wrap_content"
109+
android:maxWidth="240dp"
110+
android:layout_gravity="center"
111+
android:orientation="horizontal">
112+
113+
<TextView
114+
android:layout_width="wrap_content"
115+
android:layout_height="wrap_content"
116+
android:text="@string/bullet"
117+
android:paddingRight="4dp"
118+
android:textSize="16sp"
119+
android:textColor="@android:color/white"/>
120+
121+
<TextView
122+
android:layout_width="wrap_content"
123+
android:layout_height="wrap_content"
124+
android:maxWidth="240dp"
125+
android:text="@string/tutorial_2_subtext_2"
126+
android:layout_gravity="center"
127+
android:textAlignment="textStart"
128+
android:gravity="start"
129+
android:textColor="@android:color/white"
130+
/>
131+
132+
</LinearLayout>
133+
134+
<LinearLayout
135+
android:layout_width="wrap_content"
136+
android:layout_height="wrap_content"
137+
android:maxWidth="240dp"
138+
android:layout_gravity="center"
139+
android:orientation="horizontal">
140+
141+
<TextView
142+
android:layout_width="wrap_content"
143+
android:layout_height="wrap_content"
144+
android:text="@string/bullet"
145+
android:paddingRight="4dp"
146+
android:textSize="16sp"
147+
android:textColor="@android:color/white"/>
148+
149+
<TextView
150+
android:layout_width="wrap_content"
151+
android:layout_height="wrap_content"
152+
android:maxWidth="240dp"
153+
android:text="@string/tutorial_2_subtext_3"
154+
android:layout_gravity="center"
155+
android:textAlignment="textStart"
156+
android:gravity="start"
157+
android:textColor="@android:color/white"
158+
/>
159+
160+
</LinearLayout>
161+
87162
</LinearLayout>
88163
</LinearLayout>

‎app/src/main/res/layout-land/welcome_dont_upload.xml‎

Lines changed: 81 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,90 @@
5555
android:gravity="center_horizontal"
5656
android:textColor="@android:color/white"/>
5757

58-
<TextView
58+
<LinearLayout
59+
android:layout_width="wrap_content"
60+
android:layout_height="wrap_content"
61+
android:maxWidth="240dp"
62+
android:orientation="horizontal">
63+
64+
<TextView
65+
android:layout_width="wrap_content"
66+
android:layout_height="wrap_content"
67+
android:text="@string/bullet"
68+
android:paddingRight="4dp"
69+
android:textSize="16sp"
70+
android:paddingTop="@dimen/standard_gap"
71+
android:textColor="@android:color/white"/>
72+
73+
<TextView
74+
android:layout_width="wrap_content"
75+
android:layout_height="wrap_content"
76+
android:maxWidth="240dp"
77+
android:text="@string/tutorial_3_subtext_1"
78+
android:layout_gravity="center"
79+
android:textAlignment="textStart"
80+
android:paddingTop="@dimen/standard_gap"
81+
android:gravity="start"
82+
android:textColor="@android:color/white"
83+
/>
84+
85+
</LinearLayout>
86+
87+
<LinearLayout
5988
android:layout_width="wrap_content"
6089
android:layout_height="wrap_content"
6190
android:maxWidth="240dp"
62-
android:text="@string/tutorial_3_subtext"
6391
android:layout_gravity="center"
64-
android:textAlignment="textStart"
65-
android:paddingTop="@dimen/standard_gap"
66-
android:gravity="start"
67-
android:textColor="@android:color/white"
68-
/>
92+
android:orientation="horizontal">
93+
94+
<TextView
95+
android:layout_width="wrap_content"
96+
android:layout_height="wrap_content"
97+
android:text="@string/bullet"
98+
android:paddingRight="4dp"
99+
android:textSize="16sp"
100+
android:textColor="@android:color/white"/>
101+
102+
<TextView
103+
android:layout_width="wrap_content"
104+
android:layout_height="wrap_content"
105+
android:maxWidth="240dp"
106+
android:text="@string/tutorial_3_subtext_2"
107+
android:layout_gravity="center"
108+
android:textAlignment="textStart"
109+
android:gravity="start"
110+
android:textColor="@android:color/white"
111+
/>
112+
113+
</LinearLayout>
114+
115+
<LinearLayout
116+
android:layout_width="wrap_content"
117+
android:layout_height="wrap_content"
118+
android:maxWidth="240dp"
119+
android:orientation="horizontal">
120+
121+
<TextView
122+
android:layout_width="wrap_content"
123+
android:layout_height="wrap_content"
124+
android:text="@string/bullet"
125+
android:paddingRight="4dp"
126+
android:textSize="16sp"
127+
android:textColor="@android:color/white"/>
128+
129+
<TextView
130+
android:layout_width="wrap_content"
131+
android:layout_height="wrap_content"
132+
android:maxWidth="240dp"
133+
android:text="@string/tutorial_3_subtext_3"
134+
android:layout_gravity="center"
135+
android:textAlignment="textStart"
136+
android:gravity="start"
137+
android:textColor="@android:color/white"
138+
/>
139+
140+
</LinearLayout>
141+
69142
</LinearLayout>
143+
70144
</LinearLayout>

‎app/src/main/res/layout-land/welcome_image_details.xml‎

Lines changed: 81 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,89 @@
3838
android:gravity="center_horizontal"
3939
android:textColor="@android:color/white"/>
4040

41-
<TextView
41+
<LinearLayout
4242
android:layout_width="wrap_content"
4343
android:layout_height="wrap_content"
4444
android:maxWidth="240dp"
45-
android:text="@string/tutorial_4_subtext"
46-
android:layout_gravity="center"
47-
android:textAlignment="textStart"
48-
android:paddingTop="@dimen/standard_gap"
49-
android:gravity="start"
50-
android:textColor="@android:color/white"
51-
/>
45+
android:orientation="horizontal">
46+
47+
<TextView
48+
android:layout_width="wrap_content"
49+
android:layout_height="wrap_content"
50+
android:text="@string/bullet"
51+
android:paddingRight="4dp"
52+
android:textSize="16sp"
53+
android:paddingTop="@dimen/standard_gap"
54+
android:textColor="@android:color/white"/>
55+
56+
<TextView
57+
android:layout_width="wrap_content"
58+
android:layout_height="wrap_content"
59+
android:maxWidth="240dp"
60+
android:text="@string/tutorial_4_subtext_1"
61+
android:layout_gravity="center"
62+
android:textAlignment="textStart"
63+
android:paddingTop="@dimen/standard_gap"
64+
android:gravity="start"
65+
android:textColor="@android:color/white"
66+
/>
67+
68+
</LinearLayout>
69+
70+
<LinearLayout
71+
android:layout_width="wrap_content"
72+
android:layout_height="wrap_content"
73+
android:maxWidth="240dp"
74+
android:orientation="horizontal">
75+
76+
<TextView
77+
android:layout_width="wrap_content"
78+
android:layout_height="wrap_content"
79+
android:text="@string/bullet"
80+
android:paddingRight="4dp"
81+
android:textSize="16sp"
82+
android:textColor="@android:color/white"/>
83+
84+
<TextView
85+
android:layout_width="wrap_content"
86+
android:layout_height="wrap_content"
87+
android:maxWidth="240dp"
88+
android:text="@string/tutorial_4_subtext_2"
89+
android:layout_gravity="center"
90+
android:textAlignment="textStart"
91+
android:gravity="start"
92+
android:textColor="@android:color/white"
93+
/>
94+
95+
</LinearLayout>
96+
97+
<LinearLayout
98+
android:layout_width="wrap_content"
99+
android:layout_height="wrap_content"
100+
android:maxWidth="240dp"
101+
android:orientation="horizontal">
102+
103+
<TextView
104+
android:layout_width="wrap_content"
105+
android:layout_height="wrap_content"
106+
android:text="@string/bullet"
107+
android:paddingRight="4dp"
108+
android:textSize="16sp"
109+
android:textColor="@android:color/white"/>
110+
111+
<TextView
112+
android:layout_width="wrap_content"
113+
android:layout_height="wrap_content"
114+
android:maxWidth="240dp"
115+
android:text="@string/tutorial_4_subtext_3"
116+
android:layout_gravity="center"
117+
android:textAlignment="textStart"
118+
android:gravity="start"
119+
android:textColor="@android:color/white"
120+
/>
121+
122+
</LinearLayout>
123+
52124
</LinearLayout>
125+
53126
</LinearLayout>

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

Lines changed: 90 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,95 @@
6767
android:textColor="@android:color/white"
6868
/>
6969

70-
<TextView
71-
android:layout_width="295dp"
70+
<LinearLayout
71+
android:layout_width="match_parent"
7272
android:layout_height="wrap_content"
73-
android:maxWidth="240dp"
74-
android:text="@string/tutorial_2_subtext"
75-
android:layout_gravity="center"
76-
android:textAlignment="textStart"
77-
android:paddingTop="@dimen/standard_gap"
78-
android:gravity="start"
79-
android:textColor="@android:color/white"
80-
/>
73+
android:gravity="center"
74+
android:orientation="horizontal">
75+
76+
<TextView
77+
android:layout_width="wrap_content"
78+
android:layout_height="wrap_content"
79+
android:text="@string/bullet"
80+
android:paddingRight="4dp"
81+
android:textSize="16sp"
82+
android:paddingTop="@dimen/standard_gap"
83+
android:textColor="@android:color/white"/>
84+
85+
<TextView
86+
android:layout_width="295dp"
87+
android:layout_height="wrap_content"
88+
android:maxWidth="240dp"
89+
android:text="@string/tutorial_2_subtext_1"
90+
android:layout_gravity="center"
91+
android:textAlignment="textStart"
92+
android:paddingTop="@dimen/standard_gap"
93+
android:gravity="start"
94+
android:textColor="@android:color/white"
95+
/>
96+
97+
</LinearLayout>
98+
99+
<LinearLayout
100+
android:layout_width="match_parent"
101+
android:layout_height="wrap_content"
102+
android:gravity="center"
103+
android:orientation="horizontal">
104+
105+
<TextView
106+
android:layout_width="wrap_content"
107+
android:layout_height="wrap_content"
108+
android:text="@string/bullet"
109+
android:paddingRight="4dp"
110+
android:textSize="16sp"
111+
android:textColor="@android:color/white"/>
112+
113+
<TextView
114+
android:layout_width="295dp"
115+
android:layout_height="wrap_content"
116+
android:maxWidth="240dp"
117+
android:text="@string/tutorial_2_subtext_2"
118+
android:layout_gravity="center"
119+
android:textAlignment="textStart"
120+
android:gravity="start"
121+
android:textColor="@android:color/white"
122+
/>
123+
124+
</LinearLayout>
125+
126+
<LinearLayout
127+
android:layout_width="match_parent"
128+
android:layout_height="wrap_content"
129+
android:gravity="center"
130+
android:orientation="horizontal">
131+
132+
<LinearLayout
133+
android:layout_width="wrap_content"
134+
android:layout_height="wrap_content"
135+
android:layout_gravity="top">
136+
137+
<TextView
138+
android:layout_width="wrap_content"
139+
android:layout_height="wrap_content"
140+
android:text="@string/bullet"
141+
android:paddingRight="4dp"
142+
android:textSize="16sp"
143+
android:textColor="@android:color/white"/>
144+
145+
</LinearLayout>
146+
147+
<TextView
148+
android:layout_width="295dp"
149+
android:layout_height="wrap_content"
150+
android:maxWidth="240dp"
151+
android:text="@string/tutorial_2_subtext_3"
152+
android:layout_gravity="center"
153+
android:textAlignment="textStart"
154+
android:gravity="start"
155+
android:textColor="@android:color/white"
156+
/>
157+
158+
</LinearLayout>
159+
160+
81161
</LinearLayout>

0 commit comments

Comments
 (0)