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

Modified scroll behaviour of review activity (#2732)

Browse source
This commit is contained in:
Vanshika Arora 2019-03-26 05:09:44 +05:30 • committed by Adam Jones
parent fc3d24254c
commit c1a941eaae
3 changed files with 35 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

58
app/src/main/res/layout/activity_review.xml
View file

@ -15,27 +15,33 @@
<include layout="@layout/toolbar" /> <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" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_below="@id/toolbar"
android:orientation="vertical" 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 <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="300dp" android:layout_height="300dp"
android:layout_marginTop="5dp"> android:layout_marginTop="5dp"
>
<com.facebook.drawee.view.SimpleDraweeView <com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/imageView" android:id="@+id/imageView"
@ -73,26 +79,24 @@
</RelativeLayout> </RelativeLayout>
<fr.free.nrw.commons.review.ReviewViewPager <fr.free.nrw.commons.review.ReviewViewPager
android:id="@+id/reviewPager" android:id="@+id/reviewPager"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="300dp"
android:layout_weight="13.5"
android:fadingEdge="none" /> 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> </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> </RelativeLayout>

13
app/src/main/res/layout/fragment_review_image.xml
View file

@ -4,12 +4,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> 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 <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -31,7 +26,7 @@
<TextView <TextView
android:id="@+id/reviewQuestionContext" android:id="@+id/reviewQuestionContext"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="100dp" android:layout_height="wrap_content"
android:layout_marginBottom="15dp" android:layout_marginBottom="15dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="testing2" android:text="testing2"
@ -72,13 +67,11 @@
</LinearLayout> </LinearLayout>
</ScrollView>
<View <View
android:id="@+id/bottomview" android:id="@+id/bottomview"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="10dp" android:layout_height="15dp"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:background="?attr/colorPrimaryDark"></View> android:background="?attr/colorPrimaryDark"></View>

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

@ -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_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="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="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> </resources>