Skip to content

Commit 92a8b5e

Browse files
ashishkumar468maskaravivek
authored andcommitted
Added views for button skipLogin in layout-land and layout-xLarge, bu… (commons-app#1865)
* Added views for button skipLogin in layout-land and layout-xLarge, bug fix issue#1864 * xml improvisations * Fixed string nominated_see_more [CDATA was used inappropriately]
1 parent 8f45de4 commit 92a8b5e

File tree

2 files changed

+46
-20
lines changed

2 files changed

+46
-20
lines changed

app/src/main/res/layout-land/activity_login.xml

+23-10
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
android:layout_width="match_parent"
55
android:layout_height="match_parent">
66

7+
<LinearLayout
8+
android:layout_width="match_parent"
9+
android:layout_height="match_parent"
10+
android:orientation="vertical">
711
<FrameLayout
812
android:layout_width="400sp"
913
android:layout_height="wrap_content"
@@ -198,16 +202,15 @@
198202
android:text="@string/forgot_password"
199203
android:textColor="@color/status_bar_blue"/>
200204

201-
<fr.free.nrw.commons.ui.widget.HtmlTextView
202-
android:id="@+id/about_privacy_policy"
203-
style="?android:textAppearanceSmall"
204-
android:layout_width="wrap_content"
205-
android:layout_height="wrap_content"
206-
android:layout_below="@id/forgotPassword"
207-
android:layout_centerHorizontal="true"
208-
android:layout_gravity="center_horizontal"
209-
android:layout_marginBottom="@dimen/standard_gap"
210-
android:text="@string/about_privacy_policy" />
205+
<fr.free.nrw.commons.ui.widget.HtmlTextView
206+
android:id="@+id/skipLogin"
207+
android:layout_width="match_parent"
208+
android:layout_height="wrap_content"
209+
android:layout_marginBottom="@dimen/standard_gap"
210+
android:layout_below="@id/forgotPassword"
211+
android:gravity="center_horizontal"
212+
android:text="@string/skip_login"
213+
android:visibility="visible"/>
211214

212215
</RelativeLayout>
213216
</android.support.v7.widget.CardView>
@@ -230,5 +233,15 @@
230233
tools:ignore="UnusedAttribute" />
231234

232235
</FrameLayout>
236+
<fr.free.nrw.commons.ui.widget.HtmlTextView
237+
android:id="@+id/about_privacy_policy"
238+
style="?android:textAppearanceSmall"
239+
android:layout_width="wrap_content"
240+
android:layout_height="wrap_content"
241+
android:layout_marginBottom="@dimen/standard_gap"
242+
android:layout_below="@id/forgotPassword"
243+
android:layout_gravity="center_horizontal"
244+
android:text="@string/about_privacy_policy"/>
245+
</LinearLayout>
233246

234247
</ScrollView>

app/src/main/res/layout-xlarge/activity_login.xml

+23-10
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
android:layout_width="match_parent"
55
android:layout_height="match_parent">
66

7+
<LinearLayout
8+
android:layout_width="match_parent"
9+
android:layout_height="match_parent"
10+
android:orientation="vertical">
11+
712
<FrameLayout
813
android:layout_width="400sp"
914
android:layout_height="wrap_content"
@@ -198,16 +203,15 @@
198203
android:text="@string/forgot_password"
199204
android:textColor="@color/status_bar_blue" />
200205

201-
<fr.free.nrw.commons.ui.widget.HtmlTextView
202-
android:id="@+id/about_privacy_policy"
203-
style="?android:textAppearanceSmall"
204-
android:layout_width="wrap_content"
205-
android:layout_height="wrap_content"
206-
android:layout_below="@id/forgotPassword"
207-
android:layout_centerHorizontal="true"
208-
android:layout_gravity="center_horizontal"
209-
android:layout_marginBottom="@dimen/standard_gap"
210-
android:text="@string/about_privacy_policy" />
206+
<fr.free.nrw.commons.ui.widget.HtmlTextView
207+
android:id="@+id/skipLogin"
208+
android:layout_width="match_parent"
209+
android:layout_height="wrap_content"
210+
android:layout_marginBottom="@dimen/standard_gap"
211+
android:layout_below="@id/forgotPassword"
212+
android:gravity="center_horizontal"
213+
android:text="@string/skip_login"
214+
android:visibility="visible"/>
211215

212216
</RelativeLayout>
213217
</android.support.v7.widget.CardView>
@@ -230,5 +234,14 @@
230234
tools:ignore="UnusedAttribute" />
231235

232236
</FrameLayout>
237+
<fr.free.nrw.commons.ui.widget.HtmlTextView
238+
android:id="@+id/about_privacy_policy"
239+
style="?android:textAppearanceSmall"
240+
android:layout_width="wrap_content"
241+
android:layout_height="wrap_content"
242+
android:layout_marginBottom="@dimen/standard_gap"
243+
android:layout_gravity="center_horizontal"
244+
android:text="@string/about_privacy_policy"/>
245+
</LinearLayout>
233246

234247
</ScrollView>

0 commit comments

Comments
 (0)