From c27fe9064093ff672fc6fdf26556feab5f63f630 Mon Sep 17 00:00:00 2001 From: neslihanturan Date: Mon, 12 Nov 2018 15:50:09 +0300 Subject: [PATCH 1/2] Return to main activity from notifications activity on back button is pressed --- .../nrw/commons/notification/NotificationActivity.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java b/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java index 2108b166e1..ebeb7f7181 100644 --- a/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java @@ -26,6 +26,7 @@ import butterknife.ButterKnife; import fr.free.nrw.commons.R; import fr.free.nrw.commons.Utils; +import fr.free.nrw.commons.contributions.MainActivity; import fr.free.nrw.commons.mwapi.MediaWikiApi; import fr.free.nrw.commons.theme.NavigationBaseActivity; import fr.free.nrw.commons.utils.NetworkUtils; @@ -146,4 +147,10 @@ private void initializeAndSetNotificationList(List notificationLis .commit(); mNotificationWorkerFragment.setNotificationList(notificationList); } + + @Override + public void onBackPressed() { + startActivityWithFlags( + this, MainActivity.class, Intent.FLAG_ACTIVITY_CLEAR_TOP, + Intent.FLAG_ACTIVITY_SINGLE_TOP); } } From c2808c45817b97e726934f96b4f1155dd6d34ccb Mon Sep 17 00:00:00 2001 From: neslihanturan Date: Mon, 12 Nov 2018 16:11:16 +0300 Subject: [PATCH 2/2] Make nearby info image a little far from nearby text, to prevent wrong clicks --- app/src/main/res/layout/custom_nearby_tab_layout.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/custom_nearby_tab_layout.xml b/app/src/main/res/layout/custom_nearby_tab_layout.xml index 20cd773ba0..7f6ca0f08c 100644 --- a/app/src/main/res/layout/custom_nearby_tab_layout.xml +++ b/app/src/main/res/layout/custom_nearby_tab_layout.xml @@ -17,8 +17,8 @@ android:layout_width="18dp" android:layout_height="18dp" android:id="@+id/nearby_info_image" - android:layout_marginStart="8dp" - android:layout_marginLeft="8dp" + android:layout_marginStart="16dp" + android:layout_marginLeft="16dp" app:srcCompat="@drawable/ic_info_outline_white_24dp" /> \ No newline at end of file