Skip to content

Commit 0ef60e0

Browse files
authored
Revert "fixed. I have fixed the layout desingn of achivement activity (commons-app#2469)" (commons-app#2475)
This reverts commit c7e819d.
1 parent c7e819d commit 0ef60e0

File tree

2 files changed

+5
-14
lines changed

2 files changed

+5
-14
lines changed

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ private Single<Integer> checkDarkImage(String filePath) {
117117

118118
/**
119119
* Checks for image geolocation
120-
* returns IMAGE_OK if the place is null or if the file doesn't contain a geolocation
121120
* @param filePath file to be checked
122121
* @return IMAGE_GEOLOCATION_DIFFERENT or IMAGE_OK
123122
*/
@@ -128,11 +127,6 @@ private Single<Integer> checkImageGeoLocation(Place place, String filePath) {
128127
}
129128
return Single.fromCallable(() -> filePath)
130129
.map(fileUtilsWrapper::getGeolocationOfFile)
131-
.flatMap(geoLocation -> {
132-
if (StringUtils.isNullOrWhiteSpace(geoLocation)) {
133-
return Single.just(ImageUtils.IMAGE_OK);
134-
}
135-
return imageUtilsWrapper.checkImageGeolocationIsDifferent(geoLocation, place.getLocation());
136-
});
130+
.flatMap(geoLocation -> imageUtilsWrapper.checkImageGeolocationIsDifferent(geoLocation, place.getLocation()));
137131
}
138132
}

app/src/main/res/layout/activity_achievements.xml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,13 @@
3131
android:layout_height="match_parent"
3232
android:orientation="vertical">
3333

34+
35+
3436
<RelativeLayout
3537
android:layout_width="match_parent"
3638
android:layout_height="wrap_content"
3739
android:layout_below="@+id/toolbar"
38-
android:background="@color/opak_middle_grey"
40+
android:background="@color/layout_light_grey"
3941
android:orientation="vertical">
4042

4143
<TextView
@@ -46,7 +48,6 @@
4648
android:layout_marginStart="@dimen/activity_margin_horizontal"
4749
android:layout_marginTop="@dimen/activity_margin_horizontal"
4850
android:text="@string/level"
49-
android:textColor="@color/white"
5051
android:id="@+id/achievement_level" />
5152

5253
<ImageView
@@ -56,7 +57,7 @@
5657
android:layout_marginTop="@dimen/activity_margin_vertical"
5758
android:layout_marginRight="@dimen/activity_margin_horizontal"
5859
android:layout_alignParentRight="true"
59-
app:srcCompat="@drawable/ic_info_outline_white_24dp"
60+
app:srcCompat="@drawable/ic_info_outline_black_24dp"
6061
android:layout_marginVertical="@dimen/activity_margin_vertical" />
6162

6263
<ImageView
@@ -85,7 +86,6 @@
8586
android:layout_marginStart="@dimen/activity_margin_horizontal"
8687
android:id="@+id/images_upload_text_param"
8788
android:layout_marginTop="@dimen/achievements_activity_margin_vertical"
88-
android:textColor="@color/layout_light_grey"
8989
android:text="@string/images_uploaded" />
9090

9191
<ImageView
@@ -133,7 +133,6 @@
133133
android:layout_marginLeft="@dimen/activity_margin_horizontal"
134134
android:id="@+id/images_reverted_text"
135135
android:layout_marginStart="@dimen/activity_margin_horizontal"
136-
android:textColor="@color/layout_light_grey"
137136
android:text="@string/image_reverts" />
138137

139138
<ImageView
@@ -151,7 +150,6 @@
151150
android:layout_height="wrap_content"
152151
android:text="@string/achievements_revert_limit_message"
153152
android:textSize="10dp"
154-
android:textColor="@color/layout_light_grey"
155153
android:id="@+id/images_revert_limit_text"
156154
android:layout_marginLeft="@dimen/activity_margin_horizontal"
157155
android:layout_marginStart="@dimen/activity_margin_horizontal"
@@ -190,7 +188,6 @@
190188
style="?android:textAppearanceMedium"
191189
android:layout_width="wrap_content"
192190
android:layout_height="wrap_content"
193-
android:textColor="@color/layout_light_grey"
194191
android:id="@+id/images_used_by_wiki_text"
195192
android:layout_marginLeft="@dimen/activity_margin_horizontal"
196193
android:layout_marginStart="@dimen/activity_margin_horizontal"

0 commit comments

Comments
 (0)