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

Almost ready.

master
Tomasz Półgrabia 2016-09-17 10:32:48 +02:00
parent 7ff3f73cdd
commit fdb62e6fca
5 changed files with 57 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
package pl.tpolgrabia.urbanexplorer;
import android.app.ProgressDialog;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
@ -49,6 +50,8 @@ public class MainActivity extends ActionBarActivity {
private static final double MIN_FRAGMENT_ID = HOME_FRAGMENT_ID;
private static final String FRAG_ID = "FRAG_ID";
private static final int SETTINGS_ID_INTENT_REQUEST_ID = 2;
private static final String PHOTO_INFO = "PHOTO_INFO";
private static final String FIRST_TIME_LAUNCH = "FIRST_TIME_LAUNCH_KEY";
public static DisplayImageOptions options;
private GestureDetectorCompat gestureDetector;
private int currentFragmentId = 0;
@ -57,11 +60,21 @@ public class MainActivity extends ActionBarActivity {
private boolean locationServicesActivated = false;
private GestureDetector.OnGestureListener swipeHandler;
private PanoramioImageInfo photoInfo;
private ProgressDialog progressDlg;
public StandardLocationListener getLocationCallback() {
return locationCallback;
}
public void showProgress() {
progressDlg.show();
}
public void hideProgress() {
progressDlg.dismiss();
}
@Override
public boolean onTouchEvent(MotionEvent event) {
gestureDetector.onTouchEvent(event);
@ -78,6 +91,7 @@ public class MainActivity extends ActionBarActivity {
NetUtils.setGlobalProxyAuth(this);
currentFragmentId = 0;
progressDlg = new ProgressDialog(this);
// UNIVERSAL IMAGE LOADER SETUP
DisplayImageOptions defaultOptions = ImageLoaderUtils.createDefaultOptions();
@ -103,9 +117,19 @@ public class MainActivity extends ActionBarActivity {
Log.v(CLASS_TAG, "Restored orig frag id: " + fragId);
currentFragmentId = fragId == null ? 0 : fragId;
Log.v(CLASS_TAG, "Set final frag id: " + fragId);
photoInfo = savedInstanceState != null ? (PanoramioImageInfo) savedInstanceState.getSerializable(PHOTO_INFO) : null;
switchFragment();
updateSwipeHandler();
SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
if (sharedPrefs.getBoolean(FIRST_TIME_LAUNCH, true)) {
Toast.makeText(this, "To interact with any list itemm press long the item. When thgre is no results" +
", please, click refresh in the menu", Toast.LENGTH_LONG).show();
SharedPreferences.Editor editor = sharedPrefs.edit();
editor.putBoolean(FIRST_TIME_LAUNCH, false);
editor.commit();
}
}
@Override
@ -123,6 +147,8 @@ public class MainActivity extends ActionBarActivity {
startActivityForResult(intent, MainActivity.SETTINGS_ID_INTENT_REQUEST_ID, new Bundle());
return true;
case R.id.refresh:
progressDlg.setMessage("Refreshing results");
progressDlg.show();
switch (currentFragmentId) {
case HOME_FRAGMENT_ID:
HomeFragment homeFragment = (HomeFragment) getSupportFragmentManager()
@ -145,6 +171,10 @@ public class MainActivity extends ActionBarActivity {
}
}
public void resetPhotoInfo() {
this.photoInfo = null;
}
public void switchToPhoto(PanoramioImageInfo photoInfo) {
this.photoInfo = photoInfo;
FragmentManager fragmentManager = getSupportFragmentManager();
@ -321,6 +351,7 @@ public class MainActivity extends ActionBarActivity {
Log.v(CLASS_TAG, "1 Saving current fragment id: " + currentFragmentId);
super.onSaveInstanceState(outState);
outState.putSerializable(FRAG_ID, currentFragmentId);
outState.putSerializable(PHOTO_INFO, photoInfo);
Log.v(CLASS_TAG, "2 Saving current fragment id: " + currentFragmentId);
}

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

@ -223,6 +223,9 @@ public class HomeFragment extends Fragment {
ListView locations = (ListView) getView().findViewById(R.id.locations);
ArrayAdapter<PanoramioImageInfo> adapter = (ArrayAdapter<PanoramioImageInfo>) locations.getAdapter();
photos.addAll(images);
if (photos.isEmpty()) {
Toast.makeText(getActivity(), "No results", Toast.LENGTH_SHORT).show();
}
noMorePhotos = images.isEmpty();
if (adapter == null) {
locations.setAdapter(new PanoramioAdapter(activity, R.id.list_item, images));
@ -277,8 +280,18 @@ public class HomeFragment extends Fragment {
ArrayAdapter<PanoramioImageInfo> adapter = new PanoramioAdapter(activity,
R.layout.location_item,
images);
if (images.isEmpty()) {
Toast.makeText(getActivity(), "No results", Toast.LENGTH_SHORT).show();
}
ListView locations = (ListView)getView().findViewById(R.id.locations);
locations.setAdapter(adapter);
MainActivity mainActivity = (MainActivity) getActivity();
if (mainActivity == null) {
return;
}
mainActivity.hideProgress();
}
}
);

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

@ -91,6 +91,7 @@ public class PanoramioShowerFragment extends Fragment {
FragmentActivity acc = getActivity();
if (acc != null) {
MainActivity mainActivity = (MainActivity)acc;
mainActivity.resetPhotoInfo();
}
}
}

10
app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/WikiLocationsFragment.java
View File

@ -113,6 +113,16 @@ public class WikiLocationsFragment extends Fragment {
ListView locations = (ListView) getView().findViewById(R.id.wiki_places);
locations.setOnItemLongClickListener(new FetchWikiLocationsCallback(WikiLocationsFragment.this, appObjects));
locations.setAdapter(new WikiLocationsAdapter(activity, appObjects));
if (appObjects.isEmpty()) {
Toast.makeText(getActivity(), "No results", Toast.LENGTH_SHORT).show();
}
MainActivity mainActivity = (MainActivity) getActivity();
if (mainActivity == null) {
return;
}
mainActivity.hideProgress();
}
}
);

3
app/src/main/res/layout/wiki_locations_item.xml
View File

@ -6,7 +6,8 @@
<ImageView android:id="@+id/wiki_locs_item_img_preview"
android:layout_width="120dp"
android:layout_height="120dp"/>
android:layout_height="120dp"
android:layout_marginRight="10dp"/>
<LinearLayout android:id="@+id/wiki_locs_item_desc_container"
android:layout_width="0dp"