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

fixed. I have fixed the layout desingn of achivement activity (#2469)

Browse source
This commit is contained in:
Anike Nath 2019-02-15 17:39:31 +05:30 • committed by Vivek Maskara
parent 83770ea484
commit c7e819d404
2 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/fr/free/nrw/commons/upload/ImageProcessingService.java
View file

@ -117,6 +117,7 @@ public class ImageProcessingService {
/** /**
* Checks for image geolocation * Checks for image geolocation
* returns IMAGE_OK if the place is null or if the file doesn't contain a geolocation
* @param filePath file to be checked * @param filePath file to be checked
* @return IMAGE_GEOLOCATION_DIFFERENT or IMAGE_OK * @return IMAGE_GEOLOCATION_DIFFERENT or IMAGE_OK
*/ */
@ -127,6 +128,11 @@ public class ImageProcessingService {
} }
return Single.fromCallable(() -> filePath) return Single.fromCallable(() -> filePath)
.map(fileUtilsWrapper::getGeolocationOfFile) .map(fileUtilsWrapper::getGeolocationOfFile)
.flatMap(geoLocation -> imageUtilsWrapper.checkImageGeolocationIsDifferent(geoLocation, place.getLocation())); .flatMap(geoLocation -> {
if (StringUtils.isNullOrWhiteSpace(geoLocation)) {
return Single.just(ImageUtils.IMAGE_OK);
}
return imageUtilsWrapper.checkImageGeolocationIsDifferent(geoLocation, place.getLocation());
});
} }
} }

11
app/src/main/res/layout/activity_achievements.xml
View file

@ -31,13 +31,11 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/toolbar" android:layout_below="@+id/toolbar"
android:background="@color/layout_light_grey" android:background="@color/opak_middle_grey"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
@ -48,6 +46,7 @@
android:layout_marginStart="@dimen/activity_margin_horizontal" android:layout_marginStart="@dimen/activity_margin_horizontal"
android:layout_marginTop="@dimen/activity_margin_horizontal" android:layout_marginTop="@dimen/activity_margin_horizontal"
android:text="@string/level" android:text="@string/level"
android:textColor="@color/white"
android:id="@+id/achievement_level" /> android:id="@+id/achievement_level" />
<ImageView <ImageView
@ -57,7 +56,7 @@
android:layout_marginTop="@dimen/activity_margin_vertical" android:layout_marginTop="@dimen/activity_margin_vertical"
android:layout_marginRight="@dimen/activity_margin_horizontal" android:layout_marginRight="@dimen/activity_margin_horizontal"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
app:srcCompat="@drawable/ic_info_outline_black_24dp" app:srcCompat="@drawable/ic_info_outline_white_24dp"
android:layout_marginVertical="@dimen/activity_margin_vertical" /> android:layout_marginVertical="@dimen/activity_margin_vertical" />
<ImageView <ImageView
@ -86,6 +85,7 @@
android:layout_marginStart="@dimen/activity_margin_horizontal" android:layout_marginStart="@dimen/activity_margin_horizontal"
android:id="@+id/images_upload_text_param" android:id="@+id/images_upload_text_param"
android:layout_marginTop="@dimen/achievements_activity_margin_vertical" android:layout_marginTop="@dimen/achievements_activity_margin_vertical"
android:textColor="@color/layout_light_grey"
android:text="@string/images_uploaded" /> android:text="@string/images_uploaded" />
<ImageView <ImageView
@ -133,6 +133,7 @@
android:layout_marginLeft="@dimen/activity_margin_horizontal" android:layout_marginLeft="@dimen/activity_margin_horizontal"
android:id="@+id/images_reverted_text" android:id="@+id/images_reverted_text"
android:layout_marginStart="@dimen/activity_margin_horizontal" android:layout_marginStart="@dimen/activity_margin_horizontal"
android:textColor="@color/layout_light_grey"
android:text="@string/image_reverts" /> android:text="@string/image_reverts" />
<ImageView <ImageView
@ -150,6 +151,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/achievements_revert_limit_message" android:text="@string/achievements_revert_limit_message"
android:textSize="10dp" android:textSize="10dp"
android:textColor="@color/layout_light_grey"
android:id="@+id/images_revert_limit_text" android:id="@+id/images_revert_limit_text"
android:layout_marginLeft="@dimen/activity_margin_horizontal" android:layout_marginLeft="@dimen/activity_margin_horizontal"
android:layout_marginStart="@dimen/activity_margin_horizontal" android:layout_marginStart="@dimen/activity_margin_horizontal"
@ -188,6 +190,7 @@
style="?android:textAppearanceMedium" style="?android:textAppearanceMedium"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/layout_light_grey"
android:id="@+id/images_used_by_wiki_text" android:id="@+id/images_used_by_wiki_text"
android:layout_marginLeft="@dimen/activity_margin_horizontal" android:layout_marginLeft="@dimen/activity_margin_horizontal"
android:layout_marginStart="@dimen/activity_margin_horizontal" android:layout_marginStart="@dimen/activity_margin_horizontal"