tomasz
/
urban-explorer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed all issues (with navigation for large tablets)

master
Tomasz Półgrabia 2016-10-27 21:33:05 +02:00
parent cb0bfa8e7a
commit bfd614fd9d
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
app/src/main/java/pl/tpolgrabia/urbanexplorer/MainActivity.java
View File

@ -1,11 +1,7 @@
package pl.tpolgrabia.urbanexplorer; package pl.tpolgrabia.urbanexplorer;
import android.app.Activity;
import android.app.ProgressDialog; import android.app.ProgressDialog;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.graphics.Point;
import android.graphics.PointF;
import android.location.LocationManager; import android.location.LocationManager;
import android.os.Bundle; import android.os.Bundle;
import android.os.Looper; import android.os.Looper;
@ -14,25 +10,27 @@ import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction; import android.support.v4.app.FragmentTransaction;
import android.support.v4.view.GestureDetectorCompat; import android.support.v4.view.GestureDetectorCompat;
import android.support.v7.app.ActionBarActivity; import android.support.v7.app.ActionBarActivity;
import android.util.DisplayMetrics;
import android.view.*; import android.view.*;
import com.nostra13.universalimageloader.core.DisplayImageOptions; import com.nostra13.universalimageloader.core.DisplayImageOptions;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.Subscribe;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import pl.tpolgrabia.panoramiobindings.dto.PanoramioImageInfo;
import pl.tpolgrabia.urbanexplorer.activities.SettingsActivity; import pl.tpolgrabia.urbanexplorer.activities.SettingsActivity;
import pl.tpolgrabia.urbanexplorer.callbacks.StandardLocationListener; import pl.tpolgrabia.urbanexplorer.callbacks.StandardLocationListener;
import pl.tpolgrabia.urbanexplorer.dto.MainActivityState; import pl.tpolgrabia.urbanexplorer.dto.MainActivityState;
import pl.tpolgrabia.panoramiobindings.dto.PanoramioImageInfo;
import pl.tpolgrabia.urbanexplorer.events.RefreshSettingsEvent; import pl.tpolgrabia.urbanexplorer.events.RefreshSettingsEvent;
import pl.tpolgrabia.urbanexplorer.fragments.*; import pl.tpolgrabia.urbanexplorer.fragments.HomeFragment;
import pl.tpolgrabia.urbanexplorer.fragments.PanoramioShowerFragment;
import pl.tpolgrabia.urbanexplorer.fragments.PlacesFragment;
import pl.tpolgrabia.urbanexplorer.fragments.WikiLocationsFragment;
import pl.tpolgrabia.urbanexplorer.handlers.*; import pl.tpolgrabia.urbanexplorer.handlers.*;
import pl.tpolgrabia.urbanexplorerutils.events.DataLoadingFinishEvent;
import pl.tpolgrabia.urbanexplorerutils.events.DataLoadingStartEvent;
import pl.tpolgrabia.urbanexplorer.utils.HelperUtils; import pl.tpolgrabia.urbanexplorer.utils.HelperUtils;
import pl.tpolgrabia.urbanexplorer.views.CustomInterceptor; import pl.tpolgrabia.urbanexplorer.views.CustomInterceptor;
import pl.tpolgrabia.urbanexplorer.views.SwipeFrameLayout; import pl.tpolgrabia.urbanexplorer.views.SwipeFrameLayout;
import pl.tpolgrabia.urbanexplorerutils.events.DataLoadingFinishEvent;
import pl.tpolgrabia.urbanexplorerutils.events.DataLoadingStartEvent;
import pl.tpolgrabia.urbanexplorerutils.events.RefreshEvent; import pl.tpolgrabia.urbanexplorerutils.events.RefreshEvent;
import pl.tpolgrabia.urbanexplorerutils.utils.LocationUtils; import pl.tpolgrabia.urbanexplorerutils.utils.LocationUtils;
import pl.tpolgrabia.urbanexplorerutils.utils.NetUtils; import pl.tpolgrabia.urbanexplorerutils.utils.NetUtils;
@ -199,18 +197,18 @@ public class MainActivity extends ActionBarActivity {
this.currFrag = MainActivityState.PANORAMIO_SHOWER; this.currFrag = MainActivityState.PANORAMIO_SHOWER;
FragmentManager fragmentManager = getSupportFragmentManager(); FragmentManager fragmentManager = getSupportFragmentManager();
FragmentTransaction ctx = fragmentManager.beginTransaction(); FragmentTransaction ctx = fragmentManager.beginTransaction();
PanoramioShowerFragment panoramioShower = createShowerFragment(photoInfo);
ctx.setCustomAnimations(R.anim.slide_in_down, ctx.setCustomAnimations(R.anim.slide_in_down,
R.anim.slide_out_down, R.anim.slide_out_down,
R.anim.slide_in_up, R.anim.slide_in_up,
R.anim.slide_out_up); R.anim.slide_out_up);
Fragment frag = fragmentManager.findFragmentByTag(PanoramioShowerFragment.TAG); Fragment frag = fragmentManager.findFragmentByTag(PanoramioShowerFragment.TAG);
if (frag != null) {
ctx.replace(R.id.fragments, frag); ctx.replace(R.id.fragments, frag);
} else { // if (frag != null) {
ctx.replace(R.id.fragments, panoramioShower, PanoramioShowerFragment.TAG); // ctx.replace(R.id.fragments, frag);
} // } else {
// ctx.replace(R.id.fragments, panoramioShower, PanoramioShowerFragment.TAG);
// }
if (!savedConfiguration) { if (!savedConfiguration) {
ctx.addToBackStack(AppConstants.PHOTO_BACKSTACK); ctx.addToBackStack(AppConstants.PHOTO_BACKSTACK);
} }
@ -258,15 +256,17 @@ public class MainActivity extends ActionBarActivity {
HelperUtils.traceAllAvailableFragments(fragmentManager); HelperUtils.traceAllAvailableFragments(fragmentManager);
lg.trace("Trying to search newFragment by tag {}", tag); lg.trace("Trying to search newFragment by tag {}", tag);
Fragment currFragment = fragmentManager.findFragmentByTag(tag); // Fragment currFragment = fragmentManager.findFragmentByTag(tag);
if (currFragment == null) { final List<Fragment> fragments = fragmentManager.getFragments();
lg.trace("Using new newFragment: {}", System.identityHashCode(newFragment)); if (fragments != null) {
ctx.replace(R.id.fragments, newFragment, tag); for (Fragment frag : fragments) {
} else { if (frag == null){
lg.trace("Reusing old newFragment: {}", System.identityHashCode(currFragment)); continue;
ctx.replace(R.id.fragments, currFragment);
} }
// ctx.addToBackStack(MAIN_BACKSTACK); ctx.remove(frag);
}
}
ctx.add(R.id.fragments, newFragment);
ctx.commit(); ctx.commit();
updateSwipeHandler(); updateSwipeHandler();
} }