Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

modified scroll behaviour of review activity #2732

Merged
merged 2 commits into from
Mar 25, 2019
Merged

modified scroll behaviour of review activity #2732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46de652
modified scroll behaviour of review activity
vanshikaarora Mar 24, 2019
bf826ad
minor changes
vanshikaarora Mar 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 31 additions & 27 deletions app/src/main/res/layout/activity_review.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,33 @@

<include layout="@layout/toolbar" />

<Button
android:id="@+id/skip_image"
android:layout_width="match_parent"
android:layout_height="25dp"
android:background="@android:color/transparent"
android:layout_below="@+id/toolbar"
android:text="@string/skip_image"
android:textColor="@color/button_blue_dark"
android:textStyle="bold" />
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/skip_image"
android:layout_above="@+id/reviewPagerIndicator"
>

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/toolbar"
android:orientation="vertical"
android:weightSum="15">

<Button
android:id="@+id/skip_image"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:background="@android:color/transparent"
android:text="SKIP THIS IMAGE"
android:textColor="@color/button_blue_dark"
android:textStyle="bold" />
>

<RelativeLayout
android:layout_width="match_parent"
android:layout_height="300dp"
android:layout_marginTop="5dp">
android:layout_marginTop="5dp"
>

<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/imageView"
Expand Down Expand Up @@ -73,26 +79,24 @@

</RelativeLayout>


<fr.free.nrw.commons.review.ReviewViewPager
android:id="@+id/reviewPager"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="13.5"
android:layout_height="300dp"
android:fadingEdge="none" />


<com.viewpagerindicator.CirclePageIndicator
android:id="@+id/reviewPagerIndicator"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_gravity="center"
android:layout_weight="0.5"
android:background="?attr/colorPrimaryDark"
android:elevation="1dp"
android:foregroundGravity="center_vertical" />

</LinearLayout>
</ScrollView>
<com.viewpagerindicator.CirclePageIndicator
android:id="@+id/reviewPagerIndicator"
android:layout_width="match_parent"
android:layout_height="10dp"
android:layout_gravity="center"
android:background="?attr/colorPrimaryDark"
android:elevation="1dp"
android:foregroundGravity="center_vertical"
android:layout_alignParentBottom="true"/>


</RelativeLayout>

Expand Down
13 changes: 3 additions & 10 deletions app/src/main/res/layout/fragment_review_image.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,7 @@
android:layout_height="match_parent"
android:orientation="vertical">

<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/scroll"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_above="@+id/bottomview"
android:layout_alignParentTop="true">


<LinearLayout
android:layout_width="match_parent"
Expand All @@ -31,7 +26,7 @@
<TextView
android:id="@+id/reviewQuestionContext"
android:layout_width="match_parent"
android:layout_height="100dp"
android:layout_height="wrap_content"
android:layout_marginBottom="15dp"
android:gravity="center_vertical"
android:text="testing2"
Expand Down Expand Up @@ -72,13 +67,11 @@

</LinearLayout>

</ScrollView>


<View
android:id="@+id/bottomview"
android:layout_width="match_parent"
android:layout_height="10dp"
android:layout_height="15dp"
android:layout_alignParentBottom="true"
android:background="?attr/colorPrimaryDark"></View>

Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,4 +531,5 @@ Upload your first media by tapping on the add button.</string>
<string name="images_featured_explanation">Featured pictures are images from highly skilled photographers and illustrators that the Wikimedia Commons community has chosen as some of the highest quality on the site.</string>
<string name="images_via_nearby_explanation">Images Uploaded via Nearby places are the images which are uploaded by discovering places on the map.</string>
<string name="thanks_received_explanation" >This feature allows editors to send a Thank you notification to users who make useful edits – by using a small thank link on the history page or diff page.</string>
<string name="skip_image">SKIP THIS IMAGE</string>
</resources>