From c8cdc3aac01181bffca06dc677ec4a25cc8b2314 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mieszko=20Wrzeszczy=C5=84ski?= Date: Thu, 10 Jan 2019 23:58:33 +0100 Subject: [PATCH 1/2] fix return button --- .../java/com/uam/wmi/findmytutor/activity/BaseActivity.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java index 6b7f595..ab0acf7 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java @@ -419,6 +419,7 @@ public abstract class BaseActivity sharingFragment = SharingFragment.newInstance(); FragmentTransaction ft = getFragmentManager().beginTransaction(); ft.replace(R.id.activity_content, sharingFragment); + ft.addToBackStack(null); ft.commit(); } @@ -428,6 +429,7 @@ public abstract class BaseActivity userListFragment = UsersListFragment.newInstance(); FragmentTransaction ft = getFragmentManager().beginTransaction(); ft.replace(R.id.activity_content, userListFragment); + ft.addToBackStack(null); ft.commit(); } From 2f93dc5d54ddb18b61764032ca3f28909dfdb6fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mieszko=20Wrzeszczy=C5=84ski?= Date: Thu, 10 Jan 2019 23:59:35 +0100 Subject: [PATCH 2/2] Update gradle --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index c1e9e41..428b0f5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,7 +10,7 @@ android { applicationId "com.uam.wmi.findmytutor" minSdkVersion 22 targetSdkVersion 27 - versionCode 56 + versionCode 57 versionName "1.0.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true