mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-10-27 12:53:55 +01:00
Merge branch 'master' into feat5
This commit is contained in:
Ujjwal Agrawal
GitHub
commit
eeaa9a90ba
19 changed files with 767 additions and 185 deletions
|
|
@ -13,12 +13,12 @@
|
|||
<android.support.v7.widget.CardView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/large_gap"
|
||||
android:layout_marginBottom="@dimen/standard_gap"
|
||||
android:layout_marginEnd="@dimen/standard_gap"
|
||||
android:layout_marginLeft="@dimen/standard_gap"
|
||||
android:layout_marginRight="@dimen/standard_gap"
|
||||
android:layout_marginStart="@dimen/standard_gap"
|
||||
android:layout_marginTop="@dimen/large_gap"
|
||||
app:cardCornerRadius="4dp"
|
||||
app:cardElevation="4dp">
|
||||
|
||||
|
|
@ -40,11 +40,26 @@
|
|||
android:textColor="@android:color/white"
|
||||
android:textSize="@dimen/heading_text_size" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/login_credentials"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/title"
|
||||
android:layout_marginEnd="@dimen/standard_gap"
|
||||
android:layout_marginLeft="@dimen/standard_gap"
|
||||
android:layout_marginRight="@dimen/standard_gap"
|
||||
android:layout_marginStart="@dimen/standard_gap"
|
||||
android:paddingBottom="@dimen/standard_gap"
|
||||
android:paddingTop="@dimen/small_gap"
|
||||
android:textAlignment="center"
|
||||
android:textColor="@color/secondaryDarkColor"
|
||||
tools:text="@string/login_credential" />
|
||||
|
||||
<FrameLayout
|
||||
android:id="@+id/error_message_container"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/title"
|
||||
android:layout_below="@id/login_credentials"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible">
|
||||
|
||||
|
|
@ -56,6 +71,7 @@
|
|||
android:layout_marginLeft="@dimen/standard_gap"
|
||||
android:layout_marginRight="@dimen/standard_gap"
|
||||
android:layout_marginStart="@dimen/standard_gap"
|
||||
android:gravity="center"
|
||||
android:paddingBottom="@dimen/small_gap"
|
||||
android:paddingTop="@dimen/small_gap"
|
||||
android:textColor="@color/secondaryDarkColor"
|
||||
|
|
@ -149,8 +165,8 @@
|
|||
|
||||
<Button
|
||||
android:id="@+id/signupButton"
|
||||
android:layout_width="0dp"
|
||||
style="@style/Widget.AppCompat.Button.Borderless.Colored"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:layout_marginEnd="@dimen/small_gap"
|
||||
|
|
@ -160,8 +176,8 @@
|
|||
|
||||
<Button
|
||||
android:id="@+id/loginButton"
|
||||
android:layout_width="0dp"
|
||||
style="@style/Widget.AppCompat.Button.Colored"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="@dimen/small_gap"
|
||||
android:layout_marginStart="@dimen/small_gap"
|
||||
|
|
@ -174,13 +190,13 @@
|
|||
<fr.free.nrw.commons.ui.widget.HtmlTextView
|
||||
android:id="@+id/about_privacy_policy"
|
||||
style="?android:textAppearanceSmall"
|
||||
android:layout_below="@id/buttonFrame"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="@dimen/standard_gap"
|
||||
android:layout_below="@id/buttonFrame"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:text="@string/about_privacy_policy"
|
||||
android:layout_centerHorizontal="true"/>
|
||||
android:layout_marginBottom="@dimen/standard_gap"
|
||||
android:text="@string/about_privacy_policy" />
|
||||
|
||||
</RelativeLayout>
|
||||
</android.support.v7.widget.CardView>
|
||||
|
|
@ -188,19 +204,19 @@
|
|||
<android.support.v7.widget.AppCompatImageView
|
||||
android:layout_width="64dp"
|
||||
android:layout_height="64dp"
|
||||
android:elevation="8dp"
|
||||
tools:ignore="UnusedAttribute"
|
||||
android:layout_gravity="center_horizontal"
|
||||
app:srcCompat="@drawable/blue_rinse_circle" />
|
||||
android:elevation="8dp"
|
||||
app:srcCompat="@drawable/blue_rinse_circle"
|
||||
tools:ignore="UnusedAttribute" />
|
||||
|
||||
<android.support.v7.widget.AppCompatImageView
|
||||
android:layout_width="42dp"
|
||||
tools:ignore="UnusedAttribute"
|
||||
android:layout_height="42dp"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:layout_marginTop="8dp"
|
||||
android:elevation="8dp"
|
||||
app:srcCompat="@drawable/commons_logo_large" />
|
||||
app:srcCompat="@drawable/commons_logo_large"
|
||||
tools:ignore="UnusedAttribute" />
|
||||
|
||||
</FrameLayout>
|
||||
|
||||
|
|
|
|||
|
|
@ -73,16 +73,91 @@
|
|||
android:gravity="center_horizontal"
|
||||
android:textColor="@android:color/white"/>
|
||||
|
||||
<TextView
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxWidth="240dp"
|
||||
android:layout_gravity="center"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/bullet"
|
||||
android:paddingRight="4dp"
|
||||
android:textSize="16sp"
|
||||
android:paddingTop="@dimen/standard_gap"
|
||||
android:textColor="@android:color/white"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxWidth="240dp"
|
||||
android:text="@string/tutorial_2_subtext"
|
||||
android:text="@string/tutorial_2_subtext_1"
|
||||
android:layout_gravity="center"
|
||||
android:textAlignment="textStart"
|
||||
android:paddingTop="@dimen/standard_gap"
|
||||
android:gravity="start"
|
||||
android:textColor="@android:color/white"
|
||||
/>
|
||||
/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxWidth="240dp"
|
||||
android:layout_gravity="center"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/bullet"
|
||||
android:paddingRight="4dp"
|
||||
android:textSize="16sp"
|
||||
android:textColor="@android:color/white"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxWidth="240dp"
|
||||
android:text="@string/tutorial_2_subtext_2"
|
||||
android:layout_gravity="center"
|
||||
android:textAlignment="textStart"
|
||||
android:gravity="start"
|
||||
android:textColor="@android:color/white"
|
||||
/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxWidth="240dp"
|
||||
android:layout_gravity="center"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/bullet"
|
||||
android:paddingRight="4dp"
|
||||
android:textSize="16sp"
|
||||
android:textColor="@android:color/white"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxWidth="240dp"
|
||||
android:text="@string/tutorial_2_subtext_3"
|
||||
android:layout_gravity="center"
|
||||
android:textAlignment="textStart"
|
||||
android:gravity="start"
|
||||
android:textColor="@android:color/white"
|
||||
/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
|
|
|||
|
|
@ -55,16 +55,90 @@
|
|||
android:gravity="center_horizontal"
|
||||
android:textColor="@android:color/white"/>
|
||||
|
||||
<TextView
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxWidth="240dp"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/bullet"
|
||||
android:paddingRight="4dp"
|
||||
android:textSize="16sp"
|
||||
android:paddingTop="@dimen/standard_gap"
|
||||
android:textColor="@android:color/white"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxWidth="240dp"
|
||||
android:text="@string/tutorial_3_subtext_1"
|
||||
android:layout_gravity="center"
|
||||
android:textAlignment="textStart"
|
||||
android:paddingTop="@dimen/standard_gap"
|
||||
android:gravity="start"
|
||||
android:textColor="@android:color/white"
|
||||
/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxWidth="240dp"
|
||||
android:text="@string/tutorial_3_subtext"
|
||||
android:layout_gravity="center"
|
||||
android:textAlignment="textStart"
|
||||
android:paddingTop="@dimen/standard_gap"
|
||||
android:gravity="start"
|
||||
android:textColor="@android:color/white"
|
||||
/>
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/bullet"
|
||||
android:paddingRight="4dp"
|
||||
android:textSize="16sp"
|
||||
android:textColor="@android:color/white"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxWidth="240dp"
|
||||
android:text="@string/tutorial_3_subtext_2"
|
||||
android:layout_gravity="center"
|
||||
android:textAlignment="textStart"
|
||||
android:gravity="start"
|
||||
android:textColor="@android:color/white"
|
||||
/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxWidth="240dp"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/bullet"
|
||||
android:paddingRight="4dp"
|
||||
android:textSize="16sp"
|
||||
android:textColor="@android:color/white"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxWidth="240dp"
|
||||
android:text="@string/tutorial_3_subtext_3"
|
||||
android:layout_gravity="center"
|
||||
android:textAlignment="textStart"
|
||||
android:gravity="start"
|
||||
android:textColor="@android:color/white"
|
||||
/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
|
|
|||
|
|
@ -38,16 +38,89 @@
|
|||
android:gravity="center_horizontal"
|
||||
android:textColor="@android:color/white"/>
|
||||
|
||||
<TextView
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxWidth="240dp"
|
||||
android:text="@string/tutorial_4_subtext"
|
||||
android:layout_gravity="center"
|
||||
android:textAlignment="textStart"
|
||||
android:paddingTop="@dimen/standard_gap"
|
||||
android:gravity="start"
|
||||
android:textColor="@android:color/white"
|
||||
/>
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/bullet"
|
||||
android:paddingRight="4dp"
|
||||
android:textSize="16sp"
|
||||
android:paddingTop="@dimen/standard_gap"
|
||||
android:textColor="@android:color/white"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxWidth="240dp"
|
||||
android:text="@string/tutorial_4_subtext_1"
|
||||
android:layout_gravity="center"
|
||||
android:textAlignment="textStart"
|
||||
android:paddingTop="@dimen/standard_gap"
|
||||
android:gravity="start"
|
||||
android:textColor="@android:color/white"
|
||||
/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxWidth="240dp"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/bullet"
|
||||
android:paddingRight="4dp"
|
||||
android:textSize="16sp"
|
||||
android:textColor="@android:color/white"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxWidth="240dp"
|
||||
android:text="@string/tutorial_4_subtext_2"
|
||||
android:layout_gravity="center"
|
||||
android:textAlignment="textStart"
|
||||
android:gravity="start"
|
||||
android:textColor="@android:color/white"
|
||||
/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxWidth="240dp"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/bullet"
|
||||
android:paddingRight="4dp"
|
||||
android:textSize="16sp"
|
||||
android:textColor="@android:color/white"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxWidth="240dp"
|
||||
android:text="@string/tutorial_4_subtext_3"
|
||||
android:layout_gravity="center"
|
||||
android:textAlignment="textStart"
|
||||
android:gravity="start"
|
||||
android:textColor="@android:color/white"
|
||||
/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
|
|
|||
|
|
@ -13,12 +13,12 @@
|
|||
<android.support.v7.widget.CardView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/large_gap"
|
||||
android:layout_marginBottom="@dimen/standard_gap"
|
||||
android:layout_marginEnd="@dimen/standard_gap"
|
||||
android:layout_marginLeft="@dimen/standard_gap"
|
||||
android:layout_marginRight="@dimen/standard_gap"
|
||||
android:layout_marginStart="@dimen/standard_gap"
|
||||
android:layout_marginTop="@dimen/large_gap"
|
||||
app:cardCornerRadius="4dp"
|
||||
app:cardElevation="4dp">
|
||||
|
||||
|
|
@ -40,6 +40,21 @@
|
|||
android:textColor="@android:color/white"
|
||||
android:textSize="@dimen/heading_text_size" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/login_credentials"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/title"
|
||||
android:layout_marginEnd="@dimen/standard_gap"
|
||||
android:layout_marginLeft="@dimen/standard_gap"
|
||||
android:layout_marginRight="@dimen/standard_gap"
|
||||
android:layout_marginStart="@dimen/standard_gap"
|
||||
android:paddingBottom="@dimen/small_gap"
|
||||
android:paddingTop="@dimen/small_gap"
|
||||
android:textAlignment="center"
|
||||
android:textColor="@color/secondaryDarkColor"
|
||||
tools:text="@string/login_credential" />
|
||||
|
||||
<FrameLayout
|
||||
android:id="@+id/error_message_container"
|
||||
android:layout_width="match_parent"
|
||||
|
|
@ -56,6 +71,7 @@
|
|||
android:layout_marginLeft="@dimen/standard_gap"
|
||||
android:layout_marginRight="@dimen/standard_gap"
|
||||
android:layout_marginStart="@dimen/standard_gap"
|
||||
android:gravity="center"
|
||||
android:paddingBottom="@dimen/small_gap"
|
||||
android:paddingTop="@dimen/small_gap"
|
||||
android:textColor="@color/secondaryDarkColor"
|
||||
|
|
@ -149,8 +165,8 @@
|
|||
|
||||
<Button
|
||||
android:id="@+id/signupButton"
|
||||
android:layout_width="0dp"
|
||||
style="@style/Widget.AppCompat.Button.Borderless.Colored"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:layout_marginEnd="@dimen/small_gap"
|
||||
|
|
@ -160,8 +176,8 @@
|
|||
|
||||
<Button
|
||||
android:id="@+id/loginButton"
|
||||
android:layout_width="0dp"
|
||||
style="@style/Widget.AppCompat.Button.Colored"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="@dimen/small_gap"
|
||||
android:layout_marginStart="@dimen/small_gap"
|
||||
|
|
@ -174,13 +190,13 @@
|
|||
<fr.free.nrw.commons.ui.widget.HtmlTextView
|
||||
android:id="@+id/about_privacy_policy"
|
||||
style="?android:textAppearanceSmall"
|
||||
android:layout_below="@id/buttonFrame"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="@dimen/standard_gap"
|
||||
android:layout_below="@id/buttonFrame"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:text="@string/about_privacy_policy"
|
||||
android:layout_centerHorizontal="true"/>
|
||||
android:layout_marginBottom="@dimen/standard_gap"
|
||||
android:text="@string/about_privacy_policy" />
|
||||
|
||||
</RelativeLayout>
|
||||
</android.support.v7.widget.CardView>
|
||||
|
|
@ -188,8 +204,8 @@
|
|||
<android.support.v7.widget.AppCompatImageView
|
||||
android:layout_width="64dp"
|
||||
android:layout_height="64dp"
|
||||
android:elevation="8dp"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:elevation="8dp"
|
||||
app:srcCompat="@drawable/blue_rinse_circle"
|
||||
tools:ignore="UnusedAttribute" />
|
||||
|
||||
|
|
@ -198,9 +214,9 @@
|
|||
android:layout_height="42dp"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:layout_marginTop="8dp"
|
||||
tools:ignore="UnusedAttribute"
|
||||
android:elevation="8dp"
|
||||
app:srcCompat="@drawable/commons_logo_large" />
|
||||
app:srcCompat="@drawable/commons_logo_large"
|
||||
tools:ignore="UnusedAttribute" />
|
||||
|
||||
</FrameLayout>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,102 +5,131 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<RelativeLayout
|
||||
<ScrollView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<include
|
||||
android:id="@+id/toolbar"
|
||||
layout="@layout/toolbar"
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content" />
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
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:gravity="center"
|
||||
android:orientation="vertical">
|
||||
|
||||
<ImageView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/ic_launcher"
|
||||
android:contentDescription= "@string/commons_logo"
|
||||
/>
|
||||
|
||||
<TextView
|
||||
style="?android:textAppearanceLarge"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/app_name" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/about_version"
|
||||
android:layout_width="wrap_content"
|
||||
<include
|
||||
android:id="@+id/toolbar"
|
||||
layout="@layout/toolbar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content" />
|
||||
|
||||
<fr.free.nrw.commons.ui.widget.HtmlTextView
|
||||
android:id="@+id/about_license"
|
||||
style="?android:textAppearanceSmall"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/standard_gap"
|
||||
android:gravity="center"
|
||||
android:text="@string/about_license" />
|
||||
|
||||
<fr.free.nrw.commons.ui.widget.HtmlTextView
|
||||
android:id="@+id/about_improve"
|
||||
style="?android:textAppearanceSmall"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/small_gap"
|
||||
android:gravity="center"
|
||||
android:text="@string/about_improve" />
|
||||
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
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_height="match_parent"
|
||||
android:layout_below="@id/toolbar"
|
||||
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:orientation="vertical">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/website_launch_icon"
|
||||
android:layout_width="@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_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:contentDescription="@string/commons_logo"
|
||||
android:src="@drawable/ic_launcher" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/facebook_launch_icon"
|
||||
android:layout_width="@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"
|
||||
/>
|
||||
<TextView
|
||||
style="?android:textAppearanceLarge"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/app_name" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/github_launch_icon"
|
||||
android:layout_width="@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"
|
||||
/>
|
||||
<TextView
|
||||
android:id="@+id/about_version"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content" />
|
||||
|
||||
<fr.free.nrw.commons.ui.widget.HtmlTextView
|
||||
android:id="@+id/about_license"
|
||||
style="?android:textAppearanceSmall"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/standard_gap"
|
||||
android:gravity="center"
|
||||
android:text="@string/about_license" />
|
||||
|
||||
<fr.free.nrw.commons.ui.widget.HtmlTextView
|
||||
android:id="@+id/about_improve"
|
||||
style="?android:textAppearanceSmall"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/small_gap"
|
||||
android:gravity="center"
|
||||
android:text="@string/about_improve" />
|
||||
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
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
|
||||
android:id="@+id/website_launch_icon"
|
||||
android:layout_width="@dimen/overflow_icon_dimen"
|
||||
android:layout_height="@dimen/overflow_icon_dimen"
|
||||
android:layout_margin="@dimen/activity_margin_horizontal"
|
||||
android:contentDescription="@string/commons_website"
|
||||
app:srcCompat="@drawable/ic_action_website" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/facebook_launch_icon"
|
||||
android:layout_width="@dimen/overflow_icon_dimen"
|
||||
android:layout_height="@dimen/overflow_icon_dimen"
|
||||
android:layout_margin="@dimen/activity_margin_horizontal"
|
||||
android:contentDescription="@string/commons_facebook"
|
||||
app:srcCompat="@drawable/ic_action_facebook" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/github_launch_icon"
|
||||
android:layout_width="@dimen/overflow_icon_dimen"
|
||||
android:layout_height="@dimen/overflow_icon_dimen"
|
||||
android:layout_margin="@dimen/activity_margin_horizontal"
|
||||
android:contentDescription="@string/commons_github"
|
||||
app:srcCompat="@drawable/ic_action_github" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<fr.free.nrw.commons.ui.widget.HtmlTextView
|
||||
android:id="@+id/about_privacy_policy"
|
||||
style="?android:textAppearanceSmall"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/standard_gap"
|
||||
android:gravity="center"
|
||||
android:text="@string/about_privacy_policy" />
|
||||
|
||||
<fr.free.nrw.commons.ui.widget.HtmlTextView
|
||||
android:id="@+id/about_credits"
|
||||
style="?android:textAppearanceSmall"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/standard_gap"
|
||||
android:gravity="center"
|
||||
android:text="@string/about_credits" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/about_uploads_to"
|
||||
style="?android:textAppearanceSmall"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/large_gap"
|
||||
android:alpha="0.2"
|
||||
android:gravity="center" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
|
@ -112,6 +141,7 @@
|
|||
android:gravity="center"
|
||||
android:textColor="@color/primaryColor"
|
||||
android:text="@string/about_rate_us" />
|
||||
|
||||
<fr.free.nrw.commons.ui.widget.HtmlTextView
|
||||
android:id="@+id/about_privacy_policy"
|
||||
style="?android:textAppearanceSmall"
|
||||
|
|
@ -140,7 +170,8 @@
|
|||
android:gravity="center" />
|
||||
|
||||
</LinearLayout>
|
||||
</RelativeLayout>
|
||||
</RelativeLayout>
|
||||
</ScrollView>
|
||||
|
||||
<android.support.design.widget.NavigationView
|
||||
android:id="@+id/navigation_view"
|
||||
|
|
@ -148,6 +179,6 @@
|
|||
android:layout_height="match_parent"
|
||||
android:layout_gravity="start"
|
||||
app:headerLayout="@layout/drawer_header"
|
||||
app:menu="@menu/drawer"/>
|
||||
app:menu="@menu/drawer" />
|
||||
|
||||
</android.support.v4.widget.DrawerLayout>
|
||||
|
|
@ -44,11 +44,27 @@
|
|||
android:textColor="@android:color/white"
|
||||
android:textSize="@dimen/heading_text_size" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/login_credentials"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/title"
|
||||
android:layout_marginEnd="@dimen/standard_gap"
|
||||
android:layout_marginLeft="@dimen/standard_gap"
|
||||
android:layout_marginRight="@dimen/standard_gap"
|
||||
android:layout_marginStart="@dimen/standard_gap"
|
||||
android:paddingBottom="@dimen/small_gap"
|
||||
android:paddingTop="@dimen/small_gap"
|
||||
android:textAlignment="center"
|
||||
android:textColor="@color/secondaryDarkColor"
|
||||
tools:text="@string/login_credential" />
|
||||
|
||||
|
||||
<FrameLayout
|
||||
android:id="@+id/error_message_container"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/title"
|
||||
android:layout_below="@id/login_credentials"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible">
|
||||
|
||||
|
|
@ -60,6 +76,7 @@
|
|||
android:layout_marginLeft="@dimen/standard_gap"
|
||||
android:layout_marginRight="@dimen/standard_gap"
|
||||
android:layout_marginStart="@dimen/standard_gap"
|
||||
android:gravity="center"
|
||||
android:paddingBottom="@dimen/small_gap"
|
||||
android:paddingTop="@dimen/small_gap"
|
||||
android:textColor="@color/secondaryDarkColor"
|
||||
|
|
|
|||
|
|
@ -67,15 +67,95 @@
|
|||
android:textColor="@android:color/white"
|
||||
/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="295dp"
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxWidth="240dp"
|
||||
android:text="@string/tutorial_2_subtext"
|
||||
android:layout_gravity="center"
|
||||
android:textAlignment="textStart"
|
||||
android:paddingTop="@dimen/standard_gap"
|
||||
android:gravity="start"
|
||||
android:textColor="@android:color/white"
|
||||
/>
|
||||
android:gravity="center"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/bullet"
|
||||
android:paddingRight="4dp"
|
||||
android:textSize="16sp"
|
||||
android:paddingTop="@dimen/standard_gap"
|
||||
android:textColor="@android:color/white"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="295dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxWidth="240dp"
|
||||
android:text="@string/tutorial_2_subtext_1"
|
||||
android:layout_gravity="center"
|
||||
android:textAlignment="textStart"
|
||||
android:paddingTop="@dimen/standard_gap"
|
||||
android:gravity="start"
|
||||
android:textColor="@android:color/white"
|
||||
/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/bullet"
|
||||
android:paddingRight="4dp"
|
||||
android:textSize="16sp"
|
||||
android:textColor="@android:color/white"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="295dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxWidth="240dp"
|
||||
android:text="@string/tutorial_2_subtext_2"
|
||||
android:layout_gravity="center"
|
||||
android:textAlignment="textStart"
|
||||
android:gravity="start"
|
||||
android:textColor="@android:color/white"
|
||||
/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="top">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/bullet"
|
||||
android:paddingRight="4dp"
|
||||
android:textSize="16sp"
|
||||
android:textColor="@android:color/white"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<TextView
|
||||
android:layout_width="295dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxWidth="240dp"
|
||||
android:text="@string/tutorial_2_subtext_3"
|
||||
android:layout_gravity="center"
|
||||
android:textAlignment="textStart"
|
||||
android:gravity="start"
|
||||
android:textColor="@android:color/white"
|
||||
/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
|
@ -48,15 +48,87 @@
|
|||
android:textColor="@android:color/white"
|
||||
/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="295dp"
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxWidth="240dp"
|
||||
android:text="@string/tutorial_3_subtext"
|
||||
android:layout_gravity="center"
|
||||
android:textAlignment="textStart"
|
||||
android:paddingTop="@dimen/standard_gap"
|
||||
android:gravity="start"
|
||||
android:textColor="@android:color/white"
|
||||
/>
|
||||
android:gravity="center"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/bullet"
|
||||
android:paddingRight="4dp"
|
||||
android:textSize="16sp"
|
||||
android:paddingTop="@dimen/standard_gap"
|
||||
android:textColor="@android:color/white"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="295dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxWidth="240dp"
|
||||
android:text="@string/tutorial_3_subtext_1"
|
||||
android:layout_gravity="center"
|
||||
android:textAlignment="textStart"
|
||||
android:paddingTop="@dimen/standard_gap"
|
||||
android:gravity="start"
|
||||
android:textColor="@android:color/white"
|
||||
/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/bullet"
|
||||
android:paddingRight="4dp"
|
||||
android:textSize="16sp"
|
||||
android:textColor="@android:color/white"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="295dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxWidth="240dp"
|
||||
android:text="@string/tutorial_3_subtext_2"
|
||||
android:layout_gravity="center"
|
||||
android:textAlignment="textStart"
|
||||
android:gravity="start"
|
||||
android:textColor="@android:color/white"
|
||||
/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/bullet"
|
||||
android:paddingRight="4dp"
|
||||
android:textSize="16sp"
|
||||
android:textColor="@android:color/white"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="295dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxWidth="240dp"
|
||||
android:text="@string/tutorial_3_subtext_3"
|
||||
android:layout_gravity="center"
|
||||
android:textAlignment="textStart"
|
||||
android:gravity="start"
|
||||
android:textColor="@android:color/white"
|
||||
/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
|
@ -32,15 +32,101 @@
|
|||
android:textColor="@android:color/white"
|
||||
/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="278dp"
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxWidth="240dp"
|
||||
android:text="@string/tutorial_4_subtext"
|
||||
android:layout_gravity="center"
|
||||
android:textAlignment="textStart"
|
||||
android:paddingTop="@dimen/standard_gap"
|
||||
android:gravity="start"
|
||||
android:textColor="@android:color/white"
|
||||
/>
|
||||
android:gravity="center"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/bullet"
|
||||
android:paddingRight="4dp"
|
||||
android:textSize="16sp"
|
||||
android:paddingTop="@dimen/standard_gap"
|
||||
android:textColor="@android:color/white"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="295dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxWidth="240dp"
|
||||
android:text="@string/tutorial_4_subtext_1"
|
||||
android:layout_gravity="center"
|
||||
android:textAlignment="textStart"
|
||||
android:paddingTop="@dimen/standard_gap"
|
||||
android:gravity="start"
|
||||
android:textColor="@android:color/white"
|
||||
/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="top">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/bullet"
|
||||
android:paddingRight="4dp"
|
||||
android:textSize="16sp"
|
||||
android:textColor="@android:color/white"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<TextView
|
||||
android:layout_width="295dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxWidth="240dp"
|
||||
android:text="@string/tutorial_4_subtext_2"
|
||||
android:layout_gravity="center"
|
||||
android:textAlignment="textStart"
|
||||
android:gravity="start"
|
||||
android:textColor="@android:color/white"
|
||||
/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="top">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/bullet"
|
||||
android:paddingRight="4dp"
|
||||
android:textSize="16sp"
|
||||
android:textColor="@android:color/white"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<TextView
|
||||
android:layout_width="295dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxWidth="240dp"
|
||||
android:text="@string/tutorial_4_subtext_3"
|
||||
android:layout_gravity="center"
|
||||
android:textAlignment="textStart"
|
||||
android:gravity="start"
|
||||
android:textColor="@android:color/white"
|
||||
/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
|
@ -10,6 +10,11 @@
|
|||
android:icon="@drawable/ic_location_black_24dp"
|
||||
android:title="@string/navigation_item_nearby"/>
|
||||
|
||||
<item
|
||||
android:id="@+id/action_notifications"
|
||||
android:icon="@drawable/ic_notifications_black_24dp"
|
||||
android:title="@string/navigation_item_notification"/>
|
||||
|
||||
<item
|
||||
android:id="@+id/action_about"
|
||||
android:icon="@drawable/ic_info_outline_black_24dp"
|
||||
|
|
@ -35,9 +40,4 @@
|
|||
android:icon="@drawable/ic_exit_to_app_black_24dp"
|
||||
android:title="@string/navigation_item_logout"/>
|
||||
|
||||
<item
|
||||
android:id="@+id/action_notifications"
|
||||
android:icon="@drawable/ic_notifications_black_24dp"
|
||||
android:title="@string/navigation_item_notification"/>
|
||||
|
||||
</menu>
|
||||
|
|
|
|||
|
|
@ -1,9 +1,11 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="app_name">Commons</string>
|
||||
<string name="bullet">• </string>
|
||||
<string name="menu_settings">Settings</string>
|
||||
<string name="username">Username</string>
|
||||
<string name="password">Password</string>
|
||||
<string name="login_credential">Log in to your Commons Beta account</string>
|
||||
<string name="login">Log in</string>
|
||||
<string name="signup">Sign up</string>
|
||||
<string name="logging_in_title">Logging in</string>
|
||||
|
|
@ -77,8 +79,8 @@
|
|||
<string name="about_license">The Wikimedia Commons app is an open-source app created and maintained by grantees and volunteers of the Wikimedia community. The Wikimedia Foundation is not involved in the creation, development, or maintenance of the app. </string>
|
||||
<string name="trademarked_name" translatable="false">Wikimedia Commons</string>
|
||||
<string name="about_improve">Create a new <a href=\"https://github.com/commons-app/apps-android-commons/issues\">GitHub issue</a> for bug reports and suggestions.</string>
|
||||
<string name="about_privacy_policy"><a href=\"https://github.com/commons-app/apps-android-commons/wiki/Privacy-policy\">Privacy policy</a></string>
|
||||
<string name="about_credits"><a href=\"https://github.com/commons-app/apps-android-commons/blob/master/CREDITS\">Credits</a></string>
|
||||
<string name="about_privacy_policy"><u>Privacy policy</u></string>
|
||||
<string name="about_credits"><u>Credits</u></string>
|
||||
<string name="title_activity_about">About</string>
|
||||
<string name="menu_feedback">Send Feedback (via Email)</string>
|
||||
<string name="no_email_client">No email client installed</string>
|
||||
|
|
@ -119,11 +121,20 @@
|
|||
<string name="tutorial_1_text">Wikimedia Commons hosts most of the images that are used in Wikipedia.</string>
|
||||
<string name="tutorial_1_subtext">Your images help educate people around the world!</string>
|
||||
<string name="tutorial_2_text">Please upload pictures that are taken or created entirely by yourself:</string>
|
||||
<string name="tutorial_2_subtext">- Natural objects (flowers, animals, mountains)\n- Useful objects (bicycles, train stations)\n- Famous people (your mayor, Olympic athletes you met)</string>
|
||||
<string name="tutorial_2_subtext">Natural objects (flowers, animals, mountains)\n• Useful objects (bicycles, train stations)\n• Famous people (your mayor, Olympic athletes you met)</string>
|
||||
<string name="tutorial_2_subtext_1">Natural objects (flowers, animals, mountains)</string>
|
||||
<string name="tutorial_2_subtext_2">Useful objects (bicycles, train stations)</string>
|
||||
<string name="tutorial_2_subtext_3">Famous people (your mayor, Olympic athletes you met)</string>
|
||||
<string name="tutorial_3_text">Please do NOT upload:</string>
|
||||
<string name="tutorial_3_subtext">- Selfies or pictures of your friends\n- Pictures you downloaded from the Internet\n- Screenshots of proprietary apps</string>
|
||||
<string name="tutorial_3_subtext_1">Selfies or pictures of your friends</string>
|
||||
<string name="tutorial_3_subtext_2">Pictures you downloaded from the Internet</string>
|
||||
<string name="tutorial_3_subtext_3">Screenshots of proprietary apps</string>
|
||||
<string name="tutorial_4_text">Example upload:</string>
|
||||
<string name="tutorial_4_subtext">- Title: Sydney Opera House\n- Description: Sydney Opera House as viewed from across the bay\n- Categories: Sydney Opera House from the west, Sydney Opera House remote views</string>
|
||||
<string name="tutorial_4_subtext_1">Title: Sydney Opera House</string>
|
||||
<string name="tutorial_4_subtext_2">Description: Sydney Opera House as viewed from across the bay</string>
|
||||
<string name="tutorial_4_subtext_3">Categories: Sydney Opera House from the west, Sydney Opera House remote views</string>
|
||||
<string name="welcome_wikipedia_text">Contribute your images. Help Wikipedia articles come to life!</string>
|
||||
<string name="welcome_wikipedia_subtext">Images on Wikipedia come from Wikimedia Commons.</string>
|
||||
<string name="welcome_copyright_text">Your images help educate people around the world.</string>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue