From 0ef60e050dfbb74a824ecbdc77c274b9f54515ad Mon Sep 17 00:00:00 2001
From: Vivek Maskara <maskaravivek@gmail.com>
Date: Fri, 15 Feb 2019 17:50:04 +0530
Subject: [PATCH] Revert "fixed. I have fixed the layout desingn of achivement
 activity (#2469)" (#2475)

This reverts commit c7e819d404dfc0983f26c3802693a72cfad2d6ee.
---
 .../nrw/commons/upload/ImageProcessingService.java    |  8 +-------
 app/src/main/res/layout/activity_achievements.xml     | 11 ++++-------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/upload/ImageProcessingService.java b/app/src/main/java/fr/free/nrw/commons/upload/ImageProcessingService.java
index a03fb7e69..5992e4b34 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/ImageProcessingService.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/ImageProcessingService.java
@@ -117,7 +117,6 @@ public class ImageProcessingService {
 
     /**
      * 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
      * @return IMAGE_GEOLOCATION_DIFFERENT or IMAGE_OK
      */
@@ -128,11 +127,6 @@ public class ImageProcessingService {
         }
         return Single.fromCallable(() -> filePath)
                 .map(fileUtilsWrapper::getGeolocationOfFile)
-                .flatMap(geoLocation -> {
-                    if (StringUtils.isNullOrWhiteSpace(geoLocation)) {
-                        return Single.just(ImageUtils.IMAGE_OK);
-                    }
-                    return imageUtilsWrapper.checkImageGeolocationIsDifferent(geoLocation, place.getLocation());
-                });
+                .flatMap(geoLocation -> imageUtilsWrapper.checkImageGeolocationIsDifferent(geoLocation, place.getLocation()));
     }
 }
diff --git a/app/src/main/res/layout/activity_achievements.xml b/app/src/main/res/layout/activity_achievements.xml
index 2fcca4a0b..0fb725cc5 100644
--- a/app/src/main/res/layout/activity_achievements.xml
+++ b/app/src/main/res/layout/activity_achievements.xml
@@ -31,11 +31,13 @@
             android:layout_height="match_parent"
             android:orientation="vertical">
 
+
+
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/toolbar"
-                android:background="@color/opak_middle_grey"
+                android:background="@color/layout_light_grey"
                 android:orientation="vertical">
 
                 <TextView
@@ -46,7 +48,6 @@
                     android:layout_marginStart="@dimen/activity_margin_horizontal"
                     android:layout_marginTop="@dimen/activity_margin_horizontal"
                     android:text="@string/level"
-                    android:textColor="@color/white"
                     android:id="@+id/achievement_level" />
 
                 <ImageView
@@ -56,7 +57,7 @@
                     android:layout_marginTop="@dimen/activity_margin_vertical"
                     android:layout_marginRight="@dimen/activity_margin_horizontal"
                     android:layout_alignParentRight="true"
-                    app:srcCompat="@drawable/ic_info_outline_white_24dp"
+                    app:srcCompat="@drawable/ic_info_outline_black_24dp"
                     android:layout_marginVertical="@dimen/activity_margin_vertical" />
 
                 <ImageView
@@ -85,7 +86,6 @@
                         android:layout_marginStart="@dimen/activity_margin_horizontal"
                         android:id="@+id/images_upload_text_param"
                         android:layout_marginTop="@dimen/achievements_activity_margin_vertical"
-                        android:textColor="@color/layout_light_grey"
                         android:text="@string/images_uploaded" />
 
                     <ImageView
@@ -133,7 +133,6 @@
                         android:layout_marginLeft="@dimen/activity_margin_horizontal"
                         android:id="@+id/images_reverted_text"
                         android:layout_marginStart="@dimen/activity_margin_horizontal"
-                        android:textColor="@color/layout_light_grey"
                         android:text="@string/image_reverts" />
 
                     <ImageView
@@ -151,7 +150,6 @@
                         android:layout_height="wrap_content"
                         android:text="@string/achievements_revert_limit_message"
                         android:textSize="10dp"
-                        android:textColor="@color/layout_light_grey"
                         android:id="@+id/images_revert_limit_text"
                         android:layout_marginLeft="@dimen/activity_margin_horizontal"
                         android:layout_marginStart="@dimen/activity_margin_horizontal"
@@ -190,7 +188,6 @@
                         style="?android:textAppearanceMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textColor="@color/layout_light_grey"
                         android:id="@+id/images_used_by_wiki_text"
                         android:layout_marginLeft="@dimen/activity_margin_horizontal"
                         android:layout_marginStart="@dimen/activity_margin_horizontal"