Skip to content

Commit d48b4f3

Browse files
committed
Removed unnecessary changes
1 parent 417d6cd commit d48b4f3

File tree

3 files changed

+16
-21
lines changed

3 files changed

+16
-21
lines changed

app/build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,6 @@ dependencies {
9191
//swipe_layout
9292
implementation 'com.daimajia.swipelayout:library:1.2.0@aar'
9393
implementation 'com.nineoldandroids:library:2.4.0'
94-
95-
//Zoomy
96-
implementation 'com.ablanco.zoomy:zoomy:1.1.0'
9794
}
9895

9996
android {

app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:tools="http://schemas.android.com/tools"
43
package="fr.free.nrw.commons">
54

65
<uses-permission android:name="android.permission.INTERNET" />
@@ -24,8 +23,6 @@
2423
<!-- Needed only if your app targets Android 5.0 (API level 21) or higher. -->
2524
<uses-feature android:name="android.hardware.location.gps" />
2625

27-
<uses-sdk tools:overrideLibrary="com.ablanco.zoomy"/>
28-
2926
<application
3027
android:name=".CommonsApplication"
3128
android:icon="@mipmap/ic_launcher"

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

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,28 @@
22
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools"
5+
android:orientation="vertical"
56
android:layout_width="match_parent"
67
android:layout_height="match_parent"
78
android:background="?attr/mainBackground"
8-
android:orientation="vertical">
9+
>
910

1011
<ImageView
1112
android:id="@+id/mediaDetailImageFailed"
12-
android:layout_width="wrap_content"
1313
android:layout_height="wrap_content"
14+
android:layout_width="wrap_content"
1415
android:layout_gravity="center"
15-
android:contentDescription="@string/mediaimage_failed"
1616
android:src="@android:drawable/ic_menu_close_clear_cancel"
17-
android:visibility="gone" />
17+
android:visibility="gone"
18+
android:contentDescription="@string/mediaimage_failed"
19+
/>
1820

1921
<fr.free.nrw.commons.MediaWikiImageView
2022
android:id="@+id/mediaDetailImage"
2123
android:layout_width="match_parent"
2224
android:layout_height="match_parent"
23-
app:actualImageScaleType="fitCenter" />
25+
app:actualImageScaleType="fitCenter"
26+
/>
2427

2528
<ScrollView
2629
android:id="@+id/mediaDetailScrollView"
@@ -83,9 +86,9 @@
8386
android:layout_height="@dimen/small_gap" />
8487

8588
<LinearLayout
86-
android:id="@+id/authorLinearLayout"
8789
android:layout_width="match_parent"
8890
android:layout_height="wrap_content"
91+
android:id="@+id/authorLinearLayout"
8992
android:background="?attr/subBackground"
9093
android:orientation="vertical"
9194
android:padding="@dimen/standard_gap">
@@ -284,22 +287,20 @@
284287

285288
<LinearLayout
286289
android:id="@+id/nominatedDeletionBanner"
290+
android:background="@color/deleteRed"
287291
android:layout_width="match_parent"
288292
android:layout_height="wrap_content"
289-
android:background="@color/deleteRed"
290293
android:orientation="vertical"
291294
android:padding="@dimen/standard_gap"
292295
android:visibility="gone">
293-
294296
<TextView
295297
android:layout_width="match_parent"
296298
android:layout_height="wrap_content"
297299
android:gravity="center"
298300
android:text="@string/nominated_for_deletion"
299301
android:textColor="@color/primaryTextColor"
300302
android:textSize="@dimen/normal_text"
301-
android:textStyle="bold" />
302-
303+
android:textStyle="bold"/>
303304
<TextView
304305
android:id="@+id/seeMore"
305306
android:layout_width="match_parent"
@@ -308,7 +309,7 @@
308309
android:paddingTop="@dimen/standard_gap"
309310
android:textColor="@color/primaryTextColor"
310311
android:textSize="@dimen/normal_text"
311-
android:textStyle="bold" />
312+
android:textStyle="bold"/>
312313
</LinearLayout>
313314

314315
<Button
@@ -322,12 +323,12 @@
322323

323324
<Button
324325
android:id="@+id/nominateDeletion"
326+
android:background="@drawable/bg_delete_button"
327+
android:textColor="@color/primaryTextColor"
328+
android:layout_margin="@dimen/standard_gap"
325329
android:layout_width="match_parent"
326330
android:layout_height="wrap_content"
327-
android:layout_margin="@dimen/standard_gap"
328-
android:background="@drawable/bg_delete_button"
329-
android:text="@string/nominate_deletion"
330-
android:textColor="@color/primaryTextColor" />
331+
android:text="@string/nominate_deletion"/>
331332
</LinearLayout>
332333
</LinearLayout>
333334
</ScrollView>

0 commit comments

Comments
 (0)