diff --git a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java index 6b9b25de2..72641488a 100644 --- a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java @@ -452,7 +452,7 @@ public class LoginActivity extends AccountAuthenticatorActivity { } public void startMainActivity() { - NavigationBaseActivity.startActivityWithFlags(this, MainActivity.class, Intent.FLAG_ACTIVITY_SINGLE_TOP); + NavigationBaseActivity.startActivityWithFlags(this, NearbyTestFragmentLayersActivity.class, Intent.FLAG_ACTIVITY_SINGLE_TOP); finish(); } diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java index 12c9ae602..4031dc767 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java @@ -45,6 +45,7 @@ import fr.free.nrw.commons.mwapi.MediaWikiApi; import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient; import fr.free.nrw.commons.nearby.NearbyController; import fr.free.nrw.commons.nearby.NearbyNotificationCardView; +import fr.free.nrw.commons.nearby.NearbyTestFragmentLayersActivity; import fr.free.nrw.commons.nearby.Place; import fr.free.nrw.commons.settings.Prefs; import fr.free.nrw.commons.upload.UploadService; @@ -257,8 +258,8 @@ public class ContributionsFragment operations on first time fragment attached to an activity. Then they will be retained until fragment life time ends. */ - if (((MainActivity)getActivity()).isAuthCookieAcquired && !isFragmentAttachedBefore) { - onAuthCookieAcquired(((MainActivity)getActivity()).uploadServiceIntent); + if (((NearbyTestFragmentLayersActivity)getActivity()).isAuthCookieAcquired && !isFragmentAttachedBefore) { + onAuthCookieAcquired(((NearbyTestFragmentLayersActivity)getActivity()).uploadServiceIntent); isFragmentAttachedBefore = true; } @@ -270,7 +271,7 @@ public class ContributionsFragment */ public void showContributionsListFragment() { // show tabs on contribution list is visible - ((MainActivity) getActivity()).showTabs(); + ((NearbyTestFragmentLayersActivity) getActivity()).showTabs(); // show nearby card view on contributions list is visible if (nearbyNotificationCardView != null) { if (store.getBoolean("displayNearbyCardView", true)) { @@ -291,7 +292,7 @@ public class ContributionsFragment */ public void showMediaDetailPagerFragment() { // hide tabs on media detail view is visible - ((MainActivity)getActivity()).hideTabs(); + ((NearbyTestFragmentLayersActivity)getActivity()).hideTabs(); // hide nearby card view on media detail is visible nearbyNotificationCardView.setVisibility(View.GONE); @@ -301,7 +302,7 @@ public class ContributionsFragment @Override public void onBackStackChanged() { - ((MainActivity)getActivity()).initBackButton(); + ((NearbyTestFragmentLayersActivity)getActivity()).initBackButton(); } /** @@ -351,7 +352,7 @@ public class ContributionsFragment private void setUploadCount() { compositeDisposable.add(okHttpJsonApiClient - .getUploadCount(((MainActivity)getActivity()).sessionManager.getCurrentAccount().name) + .getUploadCount(((NearbyTestFragmentLayersActivity)getActivity()).sessionManager.getCurrentAccount().name) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(this::displayUploadCount, @@ -365,7 +366,7 @@ public class ContributionsFragment return; } - ((MainActivity)getActivity()).setNumOfUploads(uploadCount); + ((NearbyTestFragmentLayersActivity)getActivity()).setNumOfUploads(uploadCount); } @@ -420,7 +421,7 @@ public class ContributionsFragment onLocationPermissionGranted(); } else if (shouldShowRequestPermissionRationale(Manifest.permission.ACCESS_FINE_LOCATION) && store.getBoolean("displayLocationPermissionForCardView", true) - && (((MainActivity) getActivity()).viewPager.getCurrentItem() == CONTRIBUTIONS_TAB_POSITION)) { + && (((NearbyTestFragmentLayersActivity) getActivity()).viewPager.getCurrentItem() == CONTRIBUTIONS_TAB_POSITION)) { nearbyNotificationCardView.permissionType = NearbyNotificationCardView.PermissionType.ENABLE_LOCATION_PERMISSION; showNearbyCardPermissionRationale(); } diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java b/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java index 1295bb24d..aa15861aa 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java @@ -33,7 +33,7 @@ import fr.free.nrw.commons.auth.AuthenticatedActivity; import fr.free.nrw.commons.auth.SessionManager; import fr.free.nrw.commons.location.LocationServiceManager; import fr.free.nrw.commons.nearby.NearbyNotificationCardView; -import fr.free.nrw.commons.nearby.NearbyTestLayersFragment; +import fr.free.nrw.commons.nearby.mvp.fragments.NearbyParentFragment; import fr.free.nrw.commons.notification.Notification; import fr.free.nrw.commons.notification.NotificationActivity; import fr.free.nrw.commons.notification.NotificationController; @@ -73,6 +73,8 @@ public class MainActivity extends AuthenticatedActivity implements FragmentManag public boolean isContributionsFragmentVisible = true; // False means nearby fragment is visible private Menu menu; + private boolean onOrientationChanged = false; + private MenuItem notificationsMenuItem; private TextView notificationCount; @@ -84,6 +86,16 @@ public class MainActivity extends AuthenticatedActivity implements FragmentManag requestAuthToken(); initDrawer(); setTitle(getString(R.string.navigation_item_home)); // Should I create a new string variable with another name instead? + + + if (savedInstanceState != null ) { + onOrientationChanged = true; // Will be used in nearby fragment to determine significant update of map + + //If nearby map was visible, call on Tab Selected to call all nearby operations + /*if (savedInstanceState.getInt("viewPagerCurrentItem") == 1) { + ((NearbyFragment)contributionsActivityPagerAdapter.getItem(1)).onTabSelected(onOrientationChanged); + }*/ + } } @Override @@ -256,7 +268,7 @@ public class MainActivity extends AuthenticatedActivity implements FragmentManag } } else if (getSupportFragmentManager().findFragmentByTag(nearbyFragmentTag) != null && !isContributionsFragmentVisible) { // Means that nearby fragment is visible (not contributions fragment) - NearbyTestLayersFragment nearbyFragment = (NearbyTestLayersFragment) contributionsActivityPagerAdapter.getItem(1); + NearbyParentFragment nearbyFragment = (NearbyParentFragment) contributionsActivityPagerAdapter.getItem(1); if(nearbyFragment.isBottomSheetExpanded()) { // Back should first hide the bottom sheet if it is expanded @@ -340,7 +352,7 @@ public class MainActivity extends AuthenticatedActivity implements FragmentManag return true; case R.id.list_sheet: if (contributionsActivityPagerAdapter.getItem(1) != null) { - ((NearbyTestLayersFragment)contributionsActivityPagerAdapter.getItem(1)).listOptionMenuItemClicked(); + ((NearbyParentFragment)contributionsActivityPagerAdapter.getItem(1)).listOptionMenuItemClicked(); } return true; default: @@ -381,12 +393,12 @@ public class MainActivity extends AuthenticatedActivity implements FragmentManag } case 1: - NearbyTestLayersFragment retainedNearbyFragment = getNearbyFragment(1); + NearbyParentFragment retainedNearbyFragment = getNearbyFragment(1); if (retainedNearbyFragment != null) { return retainedNearbyFragment; } else { // If we reach here, retainedNearbyFragment is null - return new NearbyTestLayersFragment(); + return new NearbyParentFragment(); } default: return null; @@ -408,9 +420,9 @@ public class MainActivity extends AuthenticatedActivity implements FragmentManag * @param position index of tabs, in our case 0 or 1 * @return */ - private NearbyTestLayersFragment getNearbyFragment(int position) { + private NearbyParentFragment getNearbyFragment(int position) { String tag = makeFragmentName(R.id.pager, position); - return (NearbyTestLayersFragment)fragmentManager.findFragmentByTag(tag); + return (NearbyParentFragment)fragmentManager.findFragmentByTag(tag); } /** diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyNotificationCardView.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyNotificationCardView.java index 490eb1003..c2d3fc496 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyNotificationCardView.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyNotificationCardView.java @@ -74,7 +74,7 @@ public class NearbyNotificationCardView extends SwipableCardView { protected void onAttachedToWindow() { super.onAttachedToWindow(); // If you don't setVisibility after getting layout params, then you will se an empty space in place of nearby NotificationCardView - if (((MainActivity)getContext()).defaultKvStore.getBoolean("displayNearbyCardView", true) && this.cardViewVisibilityState == NearbyNotificationCardView.CardViewVisibilityState.READY) { + if (((NearbyTestFragmentLayersActivity)getContext()).defaultKvStore.getBoolean("displayNearbyCardView", true) && this.cardViewVisibilityState == NearbyNotificationCardView.CardViewVisibilityState.READY) { this.setVisibility(VISIBLE); } else { this.setVisibility(GONE); @@ -97,7 +97,7 @@ public class NearbyNotificationCardView extends SwipableCardView { @Override public boolean onSwipe(View view) { view.setVisibility(GONE); // Save shared preference for nearby card view accordingly - ((MainActivity) getContext()).defaultKvStore.putBoolean("displayNearbyCardView", false); + ((NearbyTestFragmentLayersActivity) getContext()).defaultKvStore.putBoolean("displayNearbyCardView", false); ViewUtil.showLongToast(getContext(), getResources().getString(R.string.nearby_notification_dismiss_message)); return true; diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyTestLayersFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyTestLayersFragment.java index 292323022..7058d27e9 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyTestLayersFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyTestLayersFragment.java @@ -183,7 +183,6 @@ public class NearbyTestLayersFragment extends CommonsDaggerSupportFragment imple @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - Log.d("denemeTest","NearbyTestLayersFragment create view"); view = inflater.inflate(R.layout.fragment_simple, container, false); ButterKnife.bind(this, view); // Inflate the layout for this fragment @@ -269,7 +268,6 @@ public class NearbyTestLayersFragment extends CommonsDaggerSupportFragment imple } public void setMapFragment(Bundle savedInstanceState) { - Log.d("denemeTest","this:"+this+", setMapFragment"); // Mapbox access token is configured here. This needs to be called either in your application // object or in the same activity which contains the mapview. Mapbox.getInstance(getActivity(), getString(R.string.mapbox_commons_app_token)); @@ -469,7 +467,7 @@ public class NearbyTestLayersFragment extends CommonsDaggerSupportFragment imple PermissionUtils.checkPermissionsAndPerformAction(getActivity(), Manifest.permission.ACCESS_FINE_LOCATION, runnable, - () -> ((MainActivity) getActivity()).viewPager.setCurrentItem(CONTRIBUTIONS_TAB_POSITION), + () -> ((NearbyTestFragmentLayersActivity) getActivity()).viewPager.setCurrentItem(CONTRIBUTIONS_TAB_POSITION), R.string.location_permission_title, R.string.location_permission_rationale_nearby); } @@ -485,6 +483,20 @@ public class NearbyTestLayersFragment extends CommonsDaggerSupportFragment imple @Override public void animateFABs() { if (fabPlus.isShown()){ + /*if (isFabOpen) { + fabPlus.startAnimation(rotate_backward); + fabCamera.startAnimation(fab_close); + fabGallery.startAnimation(fab_close); + fabCamera.hide(); + fabGallery.hide(); + } else { + fabPlus.startAnimation(rotate_forward); + fabCamera.startAnimation(fab_open); + fabGallery.startAnimation(fab_open); + fabCamera.show(); + fabGallery.show(); + } + this.isFabOpen=!isFabOpen;*/ if (isFabOpen) { closeFABs(isFabOpen); } else { diff --git a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java index 51e5815a2..d2bb64933 100644 --- a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java @@ -191,7 +191,7 @@ public abstract class NavigationBaseActivity extends BaseActivity return true; case R.id.action_nearby_test_fragment_layers: drawerLayout.closeDrawer(navigationView); - startActivityWithFlags(this, MainActivity.class, Intent.FLAG_ACTIVITY_REORDER_TO_FRONT, + startActivityWithFlags(this, NearbyTestFragmentLayersActivity.class, Intent.FLAG_ACTIVITY_REORDER_TO_FRONT, Intent.FLAG_ACTIVITY_SINGLE_TOP); return true; case R.id.action_feedback: