Select other city from settings

Author: milovanderlinden

app/build.gradle

@@ -3,13 +3,13 @@ apply plugin: 'com.android.application'
 android {
 
     compileSdkVersion 24
-    buildToolsVersion "24"
+    buildToolsVersion "24.0.2"
     defaultConfig {
         applicationId "org.open311.android"
         minSdkVersion 16
         targetSdkVersion 24
-        versionCode 4
-        versionName "1.3-alpha"
+        versionCode 5
+        versionName "1.4-alpha"
         multiDexEnabled true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/org/open311/android/MainActivity.java

@@ -1,37 +1,34 @@
 package org.open311.android;
 
-import android.app.ProgressDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.os.AsyncTask;
 import android.os.Bundle;
+import android.support.design.widget.Snackbar;
 import android.support.design.widget.TabLayout;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.view.ViewPager;
+import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.View;
 
-import org.codeforamerica.open311.facade.APIWrapper;
-import org.codeforamerica.open311.facade.APIWrapperFactory;
-import org.codeforamerica.open311.facade.EndpointType;
+import org.codeforamerica.open311.facade.Servers;
 import org.codeforamerica.open311.facade.data.City;
+import org.codeforamerica.open311.facade.data.Server;
 import org.codeforamerica.open311.facade.data.Service;
 import org.codeforamerica.open311.facade.data.ServiceRequest;
-import org.codeforamerica.open311.facade.exceptions.APIWrapperException;
+import org.open311.android.adapters.CitiesAdapter;
 import org.open311.android.adapters.ViewPagerAdapter;
 
-import org.open311.android.fragments.CityFragment;
 import org.open311.android.fragments.PolicyFragment;
 import org.open311.android.fragments.ProfileFragment;
 import org.open311.android.fragments.ReportFragment;
 import org.open311.android.fragments.RequestsFragment;
 import org.open311.android.helpers.Installation;
 
-import java.io.IOException;
 import java.util.List;
 
 import static org.open311.android.helpers.Utils.*;
@@ -41,25 +38,24 @@
 public class MainActivity extends AppCompatActivity
         implements
         RequestsFragment.OnListFragmentInteractionListener,
-        CityFragment.OnListFragmentInteractionListener,
         FragmentManager.OnBackStackChangedListener {
     private String installationId;
 
     private List<Service> services;
 
     private City currentCity;
-    private ReportFragment reportFragment;
-    private CityFragment cityFragment;
     private static final String LOG_TAG = "MainActivity";
 
     protected SharedPreferences settings;
 
-
-    public List<Service> getServices() {
-        return services;
-    }
-
     public City getCurrentCity() {
+        settings = getSettings(this);
+        String cur_city = settings.getString("current_city", null);
+        if (cur_city != null) {
+            setCurrentCity(City.fromString(cur_city));
+        } else {
+            setCurrentCity(City.fromString(getString(R.string.open311_endpoint)));
+        }
         return currentCity;
     }
 
@@ -77,8 +73,6 @@ protected void onCreate(Bundle savedInstanceState) {
         Log.d(LOG_TAG, "onCreate");
         super.onCreate(savedInstanceState);
 
-        settings = getSettings(this);
-        setCurrentCity(City.fromString(getString(R.string.open311_endpoint)));
         installationId = Installation.id(this);
         setContentView(R.layout.activity_main);
 
@@ -92,32 +86,55 @@ protected void onCreate(Bundle savedInstanceState) {
 
         TabLayout tabLayout = (TabLayout) findViewById(R.id.tabs);
         tabLayout.setupWithViewPager(viewPager);
-
-        if (savedInstanceState != null) {
-            Log.d(LOG_TAG, "Restoring reportFragment");
-            // Restore the fragment's instance
-            reportFragment = (ReportFragment) getSupportFragmentManager().getFragment(
-                    savedInstanceState, "reportFragment");
-        }
-        new DownloadPictures().execute();
     }
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
+        final List<Server> servers = new Servers().getCollection();
         getMenuInflater().inflate(R.menu.main, menu);
 
         MenuItem actionItem = menu.findItem(R.id.setting_general);
         actionItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
             @Override
             public boolean onMenuItemClick(MenuItem item) {
-                cityFragment = new CityFragment();
-                getSupportFragmentManager().beginTransaction()
-                        .add(R.id.cities_fragment, cityFragment)
-                        .commit();
-                View citiesView = findViewById(R.id.cities_fragment);
-                assert citiesView != null;
-                citiesView.bringToFront();
-                return true;
+                AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
+                if (servers == null) {
+                    String msg = getString(R.string.citiesListUnavailable);
+                    Snackbar.make(findViewById(R.id.appbar), msg, Snackbar.LENGTH_SHORT)
+                            .show();
+                    return false;
+                }
+                final String[] values = new String[servers.size()];
+                int index = 0;
+                for (Server srv : servers) {
+                    values[index] = srv.getName();
+                    index++;
+                }
+                builder.setAdapter(new CitiesAdapter(MainActivity.this, servers),
+                        new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int index) {
+                                String result = null;
+                                if (!currentCity.getCityName().equals(values[index])) {
+                                    Log.d(LOG_TAG, "onCreateOptionsMenu - Selected City: " + values[index]);
+                                    result = saveSetting(MainActivity.this, "current_city", values[index]);
+                                    getCurrentCity();
+                                    recreate();
+                                }
+                                if (result != null) {
+                                    Snackbar.make(findViewById(R.id.appbar), result, Snackbar.LENGTH_SHORT)
+                                            .show();
+                                }
+                            }
+                        });
+                builder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int id) {
+                        // User cancelled the dialog
+                        dialog.dismiss();
+                    }
+                });
+                builder.show();
+                return false;
             }
         });
         return true;
@@ -156,13 +173,6 @@ public void onBackStackChanged() {
     public void onSaveInstanceState(Bundle savedInstanceState) {
         Log.d(LOG_TAG, "onSaveInstance");
         super.onSaveInstanceState(savedInstanceState);
-        if (reportFragment != null) {
-            // Save the fragment's instance
-            Log.d(LOG_TAG, "Saving reportFragment");
-            getSupportFragmentManager().putFragment(
-                    savedInstanceState, "reportFragment", reportFragment);
-        }
-
     }
 
     @Override
@@ -176,7 +186,6 @@ public boolean onSupportNavigateUp() {
     @Override
     protected void onStop() {
         super.onStop();
-        saveSettings(this);
     }
 
     private void setupViewPager(ViewPager viewPager) {
@@ -186,7 +195,7 @@ private void setupViewPager(ViewPager viewPager) {
         adapter.addFragment(new ProfileFragment());
         adapter.addFragment(new PolicyFragment());
         viewPager.setAdapter(adapter);
-        viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener(){
+        viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
             @Override
             public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
 
@@ -209,73 +218,4 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
         Log.d(LOG_TAG, "onActivityResult");
         super.onActivityResult(requestCode, resultCode, data);
     }
-
-    @Override
-    public void onListFragmentInteraction(City item) {
-
-    }
-
-    private class DownloadPictures extends AsyncTask<String, Void, String> {
-
-        ProgressDialog progressDialog;
-
-        @Override
-        protected String doInBackground(String... params) {
-
-            APIWrapper wrapper;
-            try {
-                wrapper = new APIWrapperFactory(getCurrentCity(), EndpointType.PRODUCTION).build();
-                publishProgress();
-                services = wrapper.getServiceList();
-                publishProgress();
-                Thread.sleep(2000);
-
-            } catch (APIWrapperException e) {
-                e.printStackTrace();
-            } catch (ClassNotFoundException e) {
-                e.printStackTrace();
-            } catch (IOException e) {
-                e.printStackTrace();
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-
-            return null;
-
-        }
-
-        @Override
-        protected void onPostExecute(String result) {
-
-            progressDialog.cancel();
-
-            //Call your method that checks if the pictures were downloaded
-
-        }
-
-        @Override
-        protected void onPreExecute() {
-
-            progressDialog = new ProgressDialog(
-                    MainActivity.this);
-
-            progressDialog.setMessage(getString(R.string.contactingServer) + " " + getCurrentCity().getCityName());
-            MainActivity.this.setTitle(getString(R.string.app_name) + " " + getCurrentCity().getTitle());
-            progressDialog.setCancelable(false);
-            progressDialog.show();
-
-        }
-
-        @Override
-        protected void onProgressUpdate(Void... values) {
-            if (services == null) {
-                progressDialog.setMessage(getString(R.string.connectionEstablished));
-            } else {
-                if (services.size() > 0) {
-                    progressDialog.setMessage(services.size() + " " + getString(R.string.servicesDownloaded));
-                }
-            }
-        }
-
-    }
 }