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

Merge branch 'skip_login' of github.com:ujjwalagrawal17/apps-android-commons

Browse source
This commit is contained in:
Nicolas Raoul 2018-08-07 13:12:00 +09:00
commit f12f1d50a3
9 changed files with 178 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/res/layout/activity_login.xml
View file

@ -207,6 +207,16 @@
android:layout_marginBottom="@dimen/standard_gap"
android:text="@string/forgot_password" />
<fr.free.nrw.commons.ui.widget.HtmlTextView
android:visibility="visible"
android:id="@+id/skipLogin"
android:layout_width="match_parent"
android:gravity="center_horizontal"
android:layout_height="wrap_content"
android:layout_below="@id/forgotPassword"
android:layout_marginBottom="@dimen/standard_gap"
android:text="@string/skip_login" />
</RelativeLayout>
</android.support.v7.widget.CardView>

7
app/src/main/res/menu/drawer.xml
View file

@ -1,4 +1,11 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<group android:id="@+id/drawer_login">
<item
android:id="@+id/action_login"
android:visible="false"
android:icon="@drawable/ic_person_black_24dp"
android:title="@string/navigation_item_login" />
</group>
<group android:id="@+id/drawer_main">
<item
android:id="@+id/action_home"

5
app/src/main/res/values/strings.xml
View file

@ -247,6 +247,11 @@
<string name="nominated_for_deletion">This image has been nominated for deletion.</string>
<string name="nominated_see_more"><u>See webpage for details</u></string>
<string name="view_browser">View in Browser</string>
<string name="skip_login">Skip</string>
<string name="navigation_item_login">Log in</string>
<string name="skip_login_title">Do you really want to skip login?</string>
<string name="skip_login_message">You will not be able to upload pictures.</string>
<string name="login_alert_message">Please log in to use this feature</string>
<string name="nearby_location_has_not_changed">Location has not changed.</string>
<string name="nearby_location_not_available">Location not available.</string>