Skip to content

Commit 3dc0844

Browse files
neslihanturanneslihanturan
committed
Unkown problem occurs at map load when I try to use MainActivity again.
1 parent bf73948 commit 3dc0844

File tree

6 files changed

+22
-47
lines changed

6 files changed

+22
-47
lines changed

‎app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ public void emptySensitiveEditFields() {
452452
}
453453

454454
public void startMainActivity() {
455-
NavigationBaseActivity.startActivityWithFlags(this, NearbyTestFragmentLayersActivity.class, Intent.FLAG_ACTIVITY_SINGLE_TOP);
455+
NavigationBaseActivity.startActivityWithFlags(this, MainActivity.class, Intent.FLAG_ACTIVITY_SINGLE_TOP);
456456
finish();
457457
}
458458

‎app/src/main/java/fr/free/nrw/commons/contributions/ContributionsFragment.java

+8-9
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient;
4646
import fr.free.nrw.commons.nearby.NearbyController;
4747
import fr.free.nrw.commons.nearby.NearbyNotificationCardView;
48-
import fr.free.nrw.commons.nearby.NearbyTestFragmentLayersActivity;
4948
import fr.free.nrw.commons.nearby.Place;
5049
import fr.free.nrw.commons.settings.Prefs;
5150
import fr.free.nrw.commons.upload.UploadService;
@@ -258,8 +257,8 @@ public void onAttach(Context context) {
258257
operations on first time fragment attached to an activity. Then they will be retained
259258
until fragment life time ends.
260259
*/
261-
if (((NearbyTestFragmentLayersActivity)getActivity()).isAuthCookieAcquired && !isFragmentAttachedBefore) {
262-
onAuthCookieAcquired(((NearbyTestFragmentLayersActivity)getActivity()).uploadServiceIntent);
260+
if (((MainActivity)getActivity()).isAuthCookieAcquired && !isFragmentAttachedBefore) {
261+
onAuthCookieAcquired(((MainActivity)getActivity()).uploadServiceIntent);
263262
isFragmentAttachedBefore = true;
264263

265264
}
@@ -271,7 +270,7 @@ public void onAttach(Context context) {
271270
*/
272271
public void showContributionsListFragment() {
273272
// show tabs on contribution list is visible
274-
((NearbyTestFragmentLayersActivity) getActivity()).showTabs();
273+
((MainActivity) getActivity()).showTabs();
275274
// show nearby card view on contributions list is visible
276275
if (nearbyNotificationCardView != null) {
277276
if (store.getBoolean("displayNearbyCardView", true)) {
@@ -292,7 +291,7 @@ public void showContributionsListFragment() {
292291
*/
293292
public void showMediaDetailPagerFragment() {
294293
// hide tabs on media detail view is visible
295-
((NearbyTestFragmentLayersActivity)getActivity()).hideTabs();
294+
((MainActivity)getActivity()).hideTabs();
296295
// hide nearby card view on media detail is visible
297296
nearbyNotificationCardView.setVisibility(View.GONE);
298297

@@ -302,7 +301,7 @@ public void showMediaDetailPagerFragment() {
302301

303302
@Override
304303
public void onBackStackChanged() {
305-
((NearbyTestFragmentLayersActivity)getActivity()).initBackButton();
304+
((MainActivity)getActivity()).initBackButton();
306305
}
307306

308307
/**
@@ -352,7 +351,7 @@ public int getTotalMediaCount() {
352351
private void setUploadCount() {
353352

354353
compositeDisposable.add(okHttpJsonApiClient
355-
.getUploadCount(((NearbyTestFragmentLayersActivity)getActivity()).sessionManager.getCurrentAccount().name)
354+
.getUploadCount(((MainActivity)getActivity()).sessionManager.getCurrentAccount().name)
356355
.subscribeOn(Schedulers.io())
357356
.observeOn(AndroidSchedulers.mainThread())
358357
.subscribe(this::displayUploadCount,
@@ -366,7 +365,7 @@ private void displayUploadCount(Integer uploadCount) {
366365
return;
367366
}
368367

369-
((NearbyTestFragmentLayersActivity)getActivity()).setNumOfUploads(uploadCount);
368+
((MainActivity)getActivity()).setNumOfUploads(uploadCount);
370369

371370
}
372371

@@ -421,7 +420,7 @@ private void checkPermissionsAndShowNearbyCardView() {
421420
onLocationPermissionGranted();
422421
} else if (shouldShowRequestPermissionRationale(Manifest.permission.ACCESS_FINE_LOCATION)
423422
&& store.getBoolean("displayLocationPermissionForCardView", true)
424-
&& (((NearbyTestFragmentLayersActivity) getActivity()).viewPager.getCurrentItem() == CONTRIBUTIONS_TAB_POSITION)) {
423+
&& (((MainActivity) getActivity()).viewPager.getCurrentItem() == CONTRIBUTIONS_TAB_POSITION)) {
425424
nearbyNotificationCardView.permissionType = NearbyNotificationCardView.PermissionType.ENABLE_LOCATION_PERMISSION;
426425
showNearbyCardPermissionRationale();
427426
}

‎app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java

+7-19
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import fr.free.nrw.commons.auth.SessionManager;
3434
import fr.free.nrw.commons.location.LocationServiceManager;
3535
import fr.free.nrw.commons.nearby.NearbyNotificationCardView;
36-
import fr.free.nrw.commons.nearby.mvp.fragments.NearbyParentFragment;
36+
import fr.free.nrw.commons.nearby.NearbyTestLayersFragment;
3737
import fr.free.nrw.commons.notification.Notification;
3838
import fr.free.nrw.commons.notification.NotificationActivity;
3939
import fr.free.nrw.commons.notification.NotificationController;
@@ -73,8 +73,6 @@ public class MainActivity extends AuthenticatedActivity implements FragmentManag
7373
public boolean isContributionsFragmentVisible = true; // False means nearby fragment is visible
7474
private Menu menu;
7575

76-
private boolean onOrientationChanged = false;
77-
7876
private MenuItem notificationsMenuItem;
7977
private TextView notificationCount;
8078

@@ -86,16 +84,6 @@ public void onCreate(Bundle savedInstanceState) {
8684
requestAuthToken();
8785
initDrawer();
8886
setTitle(getString(R.string.navigation_item_home)); // Should I create a new string variable with another name instead?
89-
90-
91-
if (savedInstanceState != null ) {
92-
onOrientationChanged = true; // Will be used in nearby fragment to determine significant update of map
93-
94-
//If nearby map was visible, call on Tab Selected to call all nearby operations
95-
/*if (savedInstanceState.getInt("viewPagerCurrentItem") == 1) {
96-
((NearbyFragment)contributionsActivityPagerAdapter.getItem(1)).onTabSelected(onOrientationChanged);
97-
}*/
98-
}
9987
}
10088

10189
@Override
@@ -268,7 +256,7 @@ public void onBackPressed() {
268256
}
269257
} else if (getSupportFragmentManager().findFragmentByTag(nearbyFragmentTag) != null && !isContributionsFragmentVisible) {
270258
// Means that nearby fragment is visible (not contributions fragment)
271-
NearbyParentFragment nearbyFragment = (NearbyParentFragment) contributionsActivityPagerAdapter.getItem(1);
259+
NearbyTestLayersFragment nearbyFragment = (NearbyTestLayersFragment) contributionsActivityPagerAdapter.getItem(1);
272260

273261
if(nearbyFragment.isBottomSheetExpanded()) {
274262
// Back should first hide the bottom sheet if it is expanded
@@ -352,7 +340,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
352340
return true;
353341
case R.id.list_sheet:
354342
if (contributionsActivityPagerAdapter.getItem(1) != null) {
355-
((NearbyParentFragment)contributionsActivityPagerAdapter.getItem(1)).listOptionMenuItemClicked();
343+
((NearbyTestLayersFragment)contributionsActivityPagerAdapter.getItem(1)).listOptionMenuItemClicked();
356344
}
357345
return true;
358346
default:
@@ -393,12 +381,12 @@ public Fragment getItem(int position) {
393381
}
394382

395383
case 1:
396-
NearbyParentFragment retainedNearbyFragment = getNearbyFragment(1);
384+
NearbyTestLayersFragment retainedNearbyFragment = getNearbyFragment(1);
397385
if (retainedNearbyFragment != null) {
398386
return retainedNearbyFragment;
399387
} else {
400388
// If we reach here, retainedNearbyFragment is null
401-
return new NearbyParentFragment();
389+
return new NearbyTestLayersFragment();
402390
}
403391
default:
404392
return null;
@@ -420,9 +408,9 @@ private ContributionsFragment getContributionsFragment(int position) {
420408
* @param position index of tabs, in our case 0 or 1
421409
* @return
422410
*/
423-
private NearbyParentFragment getNearbyFragment(int position) {
411+
private NearbyTestLayersFragment getNearbyFragment(int position) {
424412
String tag = makeFragmentName(R.id.pager, position);
425-
return (NearbyParentFragment)fragmentManager.findFragmentByTag(tag);
413+
return (NearbyTestLayersFragment)fragmentManager.findFragmentByTag(tag);
426414
}
427415

428416
/**

‎app/src/main/java/fr/free/nrw/commons/nearby/NearbyNotificationCardView.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ private void init() {
7474
protected void onAttachedToWindow() {
7575
super.onAttachedToWindow();
7676
// If you don't setVisibility after getting layout params, then you will se an empty space in place of nearby NotificationCardView
77-
if (((NearbyTestFragmentLayersActivity)getContext()).defaultKvStore.getBoolean("displayNearbyCardView", true) && this.cardViewVisibilityState == NearbyNotificationCardView.CardViewVisibilityState.READY) {
77+
if (((MainActivity)getContext()).defaultKvStore.getBoolean("displayNearbyCardView", true) && this.cardViewVisibilityState == NearbyNotificationCardView.CardViewVisibilityState.READY) {
7878
this.setVisibility(VISIBLE);
7979
} else {
8080
this.setVisibility(GONE);
@@ -97,7 +97,7 @@ private void setActionListeners(Place place) {
9797
@Override public boolean onSwipe(View view) {
9898
view.setVisibility(GONE);
9999
// Save shared preference for nearby card view accordingly
100-
((NearbyTestFragmentLayersActivity) getContext()).defaultKvStore.putBoolean("displayNearbyCardView", false);
100+
((MainActivity) getContext()).defaultKvStore.putBoolean("displayNearbyCardView", false);
101101
ViewUtil.showLongToast(getContext(),
102102
getResources().getString(R.string.nearby_notification_dismiss_message));
103103
return true;

‎app/src/main/java/fr/free/nrw/commons/nearby/NearbyTestLayersFragment.java

+3-15
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ public class NearbyTestLayersFragment extends CommonsDaggerSupportFragment imple
183183
@Override
184184
public View onCreateView(LayoutInflater inflater, ViewGroup container,
185185
Bundle savedInstanceState) {
186+
Log.d("denemeTest","NearbyTestLayersFragment create view");
186187
view = inflater.inflate(R.layout.fragment_simple, container, false);
187188
ButterKnife.bind(this, view);
188189
// Inflate the layout for this fragment
@@ -268,6 +269,7 @@ public void onSlide(@NonNull View bottomSheet, float slideOffset) {
268269
}
269270

270271
public void setMapFragment(Bundle savedInstanceState) {
272+
Log.d("denemeTest","this:"+this+", setMapFragment");
271273
// Mapbox access token is configured here. This needs to be called either in your application
272274
// object or in the same activity which contains the mapview.
273275
Mapbox.getInstance(getActivity(), getString(R.string.mapbox_commons_app_token));
@@ -467,7 +469,7 @@ public void checkPermissionsAndPerformAction(Runnable runnable) {
467469
PermissionUtils.checkPermissionsAndPerformAction(getActivity(),
468470
Manifest.permission.ACCESS_FINE_LOCATION,
469471
runnable,
470-
() -> ((NearbyTestFragmentLayersActivity) getActivity()).viewPager.setCurrentItem(CONTRIBUTIONS_TAB_POSITION),
472+
() -> ((MainActivity) getActivity()).viewPager.setCurrentItem(CONTRIBUTIONS_TAB_POSITION),
471473
R.string.location_permission_title,
472474
R.string.location_permission_rationale_nearby);
473475
}
@@ -483,20 +485,6 @@ public void resumeFragment() {
483485
@Override
484486
public void animateFABs() {
485487
if (fabPlus.isShown()){
486-
/*if (isFabOpen) {
487-
fabPlus.startAnimation(rotate_backward);
488-
fabCamera.startAnimation(fab_close);
489-
fabGallery.startAnimation(fab_close);
490-
fabCamera.hide();
491-
fabGallery.hide();
492-
} else {
493-
fabPlus.startAnimation(rotate_forward);
494-
fabCamera.startAnimation(fab_open);
495-
fabGallery.startAnimation(fab_open);
496-
fabCamera.show();
497-
fabGallery.show();
498-
}
499-
this.isFabOpen=!isFabOpen;*/
500488
if (isFabOpen) {
501489
closeFABs(isFabOpen);
502490
} else {

‎app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ public boolean onNavigationItemSelected(@NonNull final MenuItem item) {
191191
return true;
192192
case R.id.action_nearby_test_fragment_layers:
193193
drawerLayout.closeDrawer(navigationView);
194-
startActivityWithFlags(this, NearbyTestFragmentLayersActivity.class, Intent.FLAG_ACTIVITY_REORDER_TO_FRONT,
194+
startActivityWithFlags(this, MainActivity.class, Intent.FLAG_ACTIVITY_REORDER_TO_FRONT,
195195
Intent.FLAG_ACTIVITY_SINGLE_TOP);
196196
return true;
197197
case R.id.action_feedback:

0 commit comments

Comments
 (0)