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

You can switch now to blank google places fragment.

master
Tomasz Półgrabia 2016-09-28 21:23:39 +02:00
parent ba8a44c12a
commit 880f5d316e
5 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,16 +19,13 @@ 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.panoramiobindings.dto.PanoramioImageInfo;
import pl.tpolgrabia.urbanexplorer.handlers.*;
import pl.tpolgrabia.urbanexplorerutils.events.DataLoadingFinishEvent; import pl.tpolgrabia.urbanexplorerutils.events.DataLoadingFinishEvent;
import pl.tpolgrabia.urbanexplorerutils.events.DataLoadingStartEvent; import pl.tpolgrabia.urbanexplorerutils.events.DataLoadingStartEvent;
import pl.tpolgrabia.urbanexplorer.fragments.HomeFragment; import pl.tpolgrabia.urbanexplorer.fragments.HomeFragment;
import pl.tpolgrabia.urbanexplorer.fragments.PanoramioShowerFragment; import pl.tpolgrabia.urbanexplorer.fragments.PanoramioShowerFragment;
import pl.tpolgrabia.urbanexplorer.fragments.Refreshable; import pl.tpolgrabia.urbanexplorer.fragments.Refreshable;
import pl.tpolgrabia.urbanexplorer.fragments.WikiLocationsFragment; import pl.tpolgrabia.urbanexplorer.fragments.WikiLocationsFragment;
import pl.tpolgrabia.urbanexplorer.handlers.PanoramioShowerSwitchHandler;
import pl.tpolgrabia.urbanexplorer.handlers.PanoramioSwitchHandler;
import pl.tpolgrabia.urbanexplorer.handlers.SwipeHandler;
import pl.tpolgrabia.urbanexplorer.handlers.WikiSwitchHandler;
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;
@ -59,14 +56,16 @@ public class MainActivity extends ActionBarActivity {
private static final Map<Integer, String> fragTags = new HashMap<>(); private static final Map<Integer, String> fragTags = new HashMap<>();
static { static {
fragTags.put(AppConstants.HOME_FRAGMENT_ID, HomeFragment.TAG); fragTags.put(MainActivityState.PANORAMIO.getOrder(), HomeFragment.TAG);
fragTags.put(AppConstants.WIKI_FRAGMENT_ID, WikiLocationsFragment.TAG); fragTags.put(MainActivityState.WIKI.getOrder(), WikiLocationsFragment.TAG);
fragTags.put(MainActivityState.GOOGLE_PLACES.getOrder(), PlacesFragment.TAG);
} }
public MainActivity() { public MainActivity() {
switchFragmentActions.put(MainActivityState.PANORAMIO_SHOWER, new PanoramioShowerSwitchHandler(this)); switchFragmentActions.put(MainActivityState.PANORAMIO_SHOWER, new PanoramioShowerSwitchHandler(this));
switchFragmentActions.put(MainActivityState.PANORAMIO, new PanoramioSwitchHandler(this)); switchFragmentActions.put(MainActivityState.PANORAMIO, new PanoramioSwitchHandler(this));
switchFragmentActions.put(MainActivityState.WIKI, new WikiSwitchHandler(this)); switchFragmentActions.put(MainActivityState.WIKI, new WikiSwitchHandler(this));
switchFragmentActions.put(MainActivityState.GOOGLE_PLACES, new GooglePlacesSwitchHandler(this));
} }
private List<PanoramioImageInfo> photos; private List<PanoramioImageInfo> photos;

2
app/src/main/java/pl/tpolgrabia/urbanexplorer/PlacesFragment.java
View File

@ -14,6 +14,8 @@ import android.view.ViewGroup;
public class PlacesFragment extends Fragment { public class PlacesFragment extends Fragment {
public static final String TAG = PlacesFragment.class.getSimpleName();
public PlacesFragment() { public PlacesFragment() {
// Required empty public constructor // Required empty public constructor
} }

3
app/src/main/java/pl/tpolgrabia/urbanexplorer/dto/MainActivityState.java
View File

@ -1,13 +1,12 @@
package pl.tpolgrabia.urbanexplorer.dto; package pl.tpolgrabia.urbanexplorer.dto;
import pl.tpolgrabia.urbanexplorer.MainActivity;
/** /**
* Created by tpolgrabia on 19.09.16. * Created by tpolgrabia on 19.09.16.
*/ */
public enum MainActivityState { public enum MainActivityState {
PANORAMIO(0), PANORAMIO(0),
WIKI(1), WIKI(1),
GOOGLE_PLACES(2),
PANORAMIO_SHOWER(-1); PANORAMIO_SHOWER(-1);
private final Integer order; private final Integer order;

1
app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/HomeFragment.java
View File

@ -15,7 +15,6 @@ 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.googleutils.utils.GeocoderUtils;
import pl.tpolgrabia.googleutils.utils.GeocoderUtils; import pl.tpolgrabia.googleutils.utils.GeocoderUtils;
import pl.tpolgrabia.panoramiobindings.utils.PanoramioUtils; import pl.tpolgrabia.panoramiobindings.utils.PanoramioUtils;
import pl.tpolgrabia.urbanexplorer.AppConstants; import pl.tpolgrabia.urbanexplorer.AppConstants;

24
app/src/main/java/pl/tpolgrabia/urbanexplorer/handlers/GooglePlacesSwitchHandler.java Normal file
View File

@ -0,0 +1,24 @@
package pl.tpolgrabia.urbanexplorer.handlers;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import pl.tpolgrabia.urbanexplorer.MainActivity;
import pl.tpolgrabia.urbanexplorer.PlacesFragment;
/**
* Created by tpolgrabia on 28.09.16.
*/
public class GooglePlacesSwitchHandler implements Runnable {
private static final Logger lg = LoggerFactory.getLogger(GooglePlacesSwitchHandler.class);
private final MainActivity mainActivity;
public GooglePlacesSwitchHandler(MainActivity mainActivity) {
this.mainActivity = mainActivity;
}
@Override
public void run() {
lg.debug("Switching to google places fragment");
mainActivity.switchFragment(new PlacesFragment(), PlacesFragment.TAG);
}
}