added flavors

.gitignore

@@ -6,3 +6,6 @@
 /build
 /captures
 *.apk
+
+app/src/dev/res/values/config.xml
+app/src/devlocal/res/values/config.xml

app/build.gradle

@@ -18,6 +18,19 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    productFlavors {
+        main {
+        }
+        dev {
+            applicationId "com.rthoni.stssaguenay.dev"
+            versionName "1.0-dev"
+        }
+        devlocal {
+            applicationId "com.rthoni.stssaguenay.devlocal"
+            versionName "1.0-devlocal"
+        }
+    }
 }
 
 dependencies {

app/src/dev/google-services.json

@@ -0,0 +1,42 @@
+{
+  "project_info": {
+    "project_number": "171393394108",
+    "firebase_url": "https://admob-app-id-3084832113.firebaseio.com",
+    "project_id": "admob-app-id-3084832113",
+    "storage_bucket": "admob-app-id-3084832113.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:171393394108:android:6fd8956541c81e90",
+        "android_client_info": {
+          "package_name": "com.rthoni.stssaguenay.dev"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "171393394108-eovbvhuab49spjk18c382f1ueqij1lvv.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyDfBkaeX5670C6Y-AYZgl5wRNV-pr8mldw"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 1,
+          "other_platform_oauth_client": []
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

app/src/devlocal/google-services.json

@@ -0,0 +1,42 @@
+{
+  "project_info": {
+    "project_number": "171393394108",
+    "firebase_url": "https://admob-app-id-3084832113.firebaseio.com",
+    "project_id": "admob-app-id-3084832113",
+    "storage_bucket": "admob-app-id-3084832113.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:171393394108:android:6fd8956541c81e90",
+        "android_client_info": {
+          "package_name": "com.rthoni.stssaguenay.devlocal"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "171393394108-eovbvhuab49spjk18c382f1ueqij1lvv.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyDfBkaeX5670C6Y-AYZgl5wRNV-pr8mldw"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 1,
+          "other_platform_oauth_client": []
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

app/src/main/java/com/rthoni/stssaguenay/business/STSBusiness.java

@@ -3,6 +3,7 @@ package com.rthoni.stssaguenay.business;
 import android.content.Context;
 
 import com.luticate.utils.dbo.LuDataAccessConfigDbo;
+import com.rthoni.stssaguenay.R;
 import com.rthoni.stssaguenay.dataaccess.STSDataAccess;
 import com.rthoni.stssaguenay.dbo.UserFavouriteStopsDbo;
 import com.rthoni.stssaguenay.dbo.UserDbo;
@@ -22,11 +23,19 @@ public class STSBusiness {
 
     private static LuDataAccessConfigDbo _config = null;
 
-    public static LuDataAccessConfigDbo getConfig()
+    public static LuDataAccessConfigDbo getConfig(Context ctx)
     {
         if (_config == null) {
             _config = new LuDataAccessConfigDbo();
-            _config.setBaseUrl("http://gigi-eth:8089/");
+            try {
+                String str = ctx.getString(R.string.luticate_config);
+                _config.fromJson(new JSONObject(str));
+            } catch (JSONException e) {
+                e.printStackTrace();
+                _config = null;
+                return null;
+            }
+//            _config.setBaseUrl("http://gigi-eth:8089/");
         }
         return _config;
     }

app/src/main/java/com/rthoni/stssaguenay/ui/activities/MainActivity.java

@@ -6,7 +6,9 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.support.design.widget.FloatingActionButton;
 import android.support.design.widget.NavigationView;
+import android.support.v4.app.FragmentManager;
 import android.support.v4.widget.DrawerLayout;
+import android.support.v7.app.ActionBar;
 import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
@@ -37,10 +39,12 @@ import com.luticate.utils.dbo.LuVoidDbo;
 import com.rthoni.stssaguenay.R;
 import com.rthoni.stssaguenay.business.STSBusiness;
 import com.rthoni.stssaguenay.business.UsersSettingsBusiness;
+import com.rthoni.stssaguenay.dbo.StopsDbo;
 import com.rthoni.stssaguenay.dbo.UserFavouriteStopsDbo;
 import com.rthoni.stssaguenay.dbo.UserDbo;
 import com.rthoni.stssaguenay.dbo.UsersSettingsDbo;
 import com.rthoni.stssaguenay.ui.fragments.HomeFragment;
+import com.rthoni.stssaguenay.ui.fragments.StopViewerFragment;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -72,6 +76,10 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
 
     private CallbackManager _callbackManager;
 
+    private ActionBar _actionBar;
+
+    private FragmentManager _fragmentManager;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -149,10 +157,32 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
             }
         });
 
+
+        _fragmentManager = getSupportFragmentManager();
+        _fragmentManager.addOnBackStackChangedListener(new FragmentManager.OnBackStackChangedListener() {
+            @Override
+            public void onBackStackChanged() {
+                if (_fragmentManager.getBackStackEntryCount() == 0) {
+                    goToHome();
+                }
+            }
+        });
+
+        _actionBar = getSupportActionBar();
+
         updateLoginState();
         goToHome();
     }
 
+    @Override
+    public boolean onSupportNavigateUp() {
+        if (_fragmentManager.getBackStackEntryCount() == 0) {
+            return super.onSupportNavigateUp();
+        }
+        _fragmentManager.popBackStack();
+        return true;
+    }
+
     @Override
     protected void onResume() {
         if (_goToHome) {
@@ -166,13 +196,25 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
     {
         _fab.show();
         HomeFragment f = new HomeFragment();
+        f.setOnFavouriteStopClicked(new LuPromise.LuConsumer<UserFavouriteStopsDbo>() {
+            @Override
+            public void execute(UserFavouriteStopsDbo data) {
+                goToStop(data.getStop());
+            }
+        });
         getSupportFragmentManager().beginTransaction().replace(R.id.container, f).commit();
     }
 
-    public void goToStop()
+    public void goToStop(StopsDbo stopsDbo)
     {
         _fab.hide();
-
+        StopViewerFragment f = new StopViewerFragment();
+        f.setStopsDbo(stopsDbo);
+        getSupportFragmentManager()
+                .beginTransaction()
+                .replace(R.id.container, f)
+                .addToBackStack("StopViewerFragment")
+                .commit();
     }
 
     public void goToAddStop()
@@ -282,7 +324,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
         progressDialog.setMessage(getString(R.string.settings_restoring));
 
         UserDbo user = STSBusiness.getLoggedUser(MainActivity.this);
-        UsersSettingsBusiness.get(STSBusiness.getConfig(), user.getId())
+        UsersSettingsBusiness.get(STSBusiness.getConfig(this), user.getId())
                 .then(new LuPromise.LuConsumer<String>() {
                     @Override
                     public void execute(final String data) {
@@ -329,7 +371,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
                 progressDialog.show();
                 progressDialog.setTitle(R.string.loading);
                 progressDialog.setMessage(getString(R.string.settings_backing_up));
-                UsersSettingsBusiness.put(STSBusiness.getConfig(), data, user.getId())
+                UsersSettingsBusiness.put(STSBusiness.getConfig(MainActivity.this), data, user.getId())
                         .then(new LuPromise.LuConsumer<LuVoidDbo>() {
                             @Override
                             public void execute(LuVoidDbo data) {

app/src/main/java/com/rthoni/stssaguenay/ui/fragments/HomeFragment.java

@@ -18,6 +18,7 @@ import com.luticate.utils.business.LuPromise;
 import com.rthoni.stssaguenay.R;
 import com.rthoni.stssaguenay.business.STSBusiness;
 import com.rthoni.stssaguenay.business.SchedulesBusiness;
+import com.rthoni.stssaguenay.dbo.StopsDbo;
 import com.rthoni.stssaguenay.dbo.UserFavouriteStopsDbo;
 import com.rthoni.stssaguenay.dbo.SchedulesDbo;
 
@@ -43,7 +44,9 @@ public class HomeFragment extends Fragment {
     @BindView(R.id.swipeContainer)
     SwipeRefreshLayout _swipeRefreshLayout;
 
-    FavouriteStopsAdapter _adapter;
+    private FavouriteStopsAdapter _adapter;
+
+    private LuPromise.LuConsumer<UserFavouriteStopsDbo> _onFavouriteStopClicked;
 
     public static class ViewHolder extends RecyclerView.ViewHolder {
         public View _parentView;
@@ -172,6 +175,9 @@ public class HomeFragment extends Fragment {
 
     public void onFavouriteClicked(UserFavouriteStopsDbo favouriteStopDbo)
     {
+        if (_onFavouriteStopClicked != null) {
+            _onFavouriteStopClicked.execute(favouriteStopDbo);
+        }
     }
 
     public void onFavouriteLongClicked(final UserFavouriteStopsDbo favouriteStopDbo)
@@ -205,7 +211,7 @@ public class HomeFragment extends Fragment {
         DateTimeZone dtz = DateTimeZone.forOffsetMillis(TimeZone.getDefault().getRawOffset() + TimeZone.getDefault().getDSTSavings());
         LocalDateTime date = LocalDateTime.now(dtz).plusMinutes(-30);
 
-        SchedulesBusiness.getMultiple(STSBusiness.getConfig(), _adapter.getFavourites(), date, 10)
+        SchedulesBusiness.getMultiple(STSBusiness.getConfig(getContext()), _adapter.getFavourites(), date, 10)
                 .then(new LuPromise.LuConsumer<List<SchedulesDbo>>() {
                     @Override
                     public void execute(List<SchedulesDbo> data) {
@@ -220,4 +226,8 @@ public class HomeFragment extends Fragment {
                     }
                 });
     }
+
+    public void setOnFavouriteStopClicked(LuPromise.LuConsumer<UserFavouriteStopsDbo> onFavouriteStopClicked) {
+        _onFavouriteStopClicked = onFavouriteStopClicked;
+    }
 }

app/src/main/java/com/rthoni/stssaguenay/ui/fragments/StopPickerFragment.java

@@ -177,7 +177,7 @@ public class StopPickerFragment extends Fragment {
         progressDialog.setTitle(R.string.loading);
         progressDialog.setMessage(getString(R.string.loading_stops));
 
-        StopsBusiness.getAll(STSBusiness.getConfig())
+        StopsBusiness.getAll(STSBusiness.getConfig(getContext()))
                 .then(new LuPromise.LuConsumer<List<StopsDbo>>() {
                     @Override
                     public void execute(List<StopsDbo> data) {

app/src/main/java/com/rthoni/stssaguenay/ui/fragments/StopRoutesPickerFragment.java

@@ -156,7 +156,7 @@ public class StopRoutesPickerFragment extends Fragment {
         progressDialog.setTitle(R.string.loading);
         progressDialog.setMessage(getString(R.string.loading_routes));
 
-        RoutesBusiness.getAll(STSBusiness.getConfig())
+        RoutesBusiness.getAll(STSBusiness.getConfig(getContext()))
                 .then(new LuPromise.LuConsumer<List<RoutesDbo>>() {
                     @Override
                     public void execute(List<RoutesDbo> data) {

app/src/main/java/com/rthoni/stssaguenay/ui/fragments/StopViewerFragment.java

@@ -0,0 +1,42 @@
+package com.rthoni.stssaguenay.ui.fragments;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import com.rthoni.stssaguenay.R;
+import com.rthoni.stssaguenay.dbo.StopsDbo;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+/**
+ * Created by robin on 10/6/16.
+ */
+
+public class StopViewerFragment extends Fragment {
+
+    @BindView(R.id.textView)
+    TextView _textStop;
+
+    private StopsDbo _stopsDbo;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        View v = inflater.inflate(R.layout.fragment_stop_viewer, container, false);
+        ButterKnife.bind(this, v);
+
+        _textStop.setText(_stopsDbo.getFullName());
+
+        return v;
+    }
+
+    public void setStopsDbo(StopsDbo stopsDbo) {
+        _stopsDbo = stopsDbo;
+    }
+}

app/src/main/res/layout/fragment_stop_viewer.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/textView"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        tools:text="268 - Émile-Girardin / Roitelets"
+        android:gravity="center_horizontal"/>
+</LinearLayout>

app/src/main/res/values/strings.xml

@@ -3,6 +3,7 @@
     <string name="banner_ad_unit_id">ca-app-pub-3940256099942544/6300978111</string>
     <string name="ad_init">ca-app-pub-2016581167110949~3084832113</string>
     <string name="facebook_app_id">1463583156990249</string>
+    <string name="luticate_config">{\"baseURL\": \"https://sts.rthoni.com/api/v1/\"}</string>
 
 
     <string name="navigation_drawer_open">Open navigation drawer</string>

luticateutils/src/main/java/com/luticate/utils/dbo/LuDataAccessConfigDbo.java

@@ -1,5 +1,10 @@
 package com.luticate.utils.dbo;
 
+import android.util.Base64;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -7,9 +12,13 @@ import java.util.Map;
  *
  * Created by robin on 11/28/15.
  */
-public class LuDataAccessConfigDbo {
+public class LuDataAccessConfigDbo extends LuDbo {
+
+    protected String _baseUrl;
+
+    protected String _httpUsername;
 
-    private String _baseUrl;
+    protected String _httpPassword;
 
     public String getBaseUrl() {
         return _baseUrl;
@@ -19,9 +28,47 @@ public class LuDataAccessConfigDbo {
         _baseUrl = baseUrl;
     }
 
+    public String getHttpUsername() {
+        return _httpUsername;
+    }
+
+    public void setHttpUsername(String httpUsername) {
+        _httpUsername = httpUsername;
+    }
+
+    public String getHttpPassword() {
+        return _httpPassword;
+    }
+
+    public void setHttpPassword(String httpPassword) {
+        _httpPassword = httpPassword;
+    }
+
     public Map<String, String> getHeaders()
     {
         Map<String, String> map = new HashMap<>();
+        if (_httpUsername != null) {
+            map.put("Authorization", "Basic " + Base64.encodeToString(
+                    String.format("%s:%s", _httpUsername, _httpPassword).getBytes(), Base64.DEFAULT));
+        }
         return map;
     }
+
+    @Override
+    public void fromJson(JSONObject json) throws JSONException {
+        _baseUrl = json.getString("baseURL");
+        if (!json.isNull("httpUsername")) {
+            _httpUsername = json.getString("httpUsername");
+            _httpPassword = json.getString("httpPassword");
+        }
+        else {
+            _httpUsername = null;
+            _httpPassword = null;
+        }
+    }
+
+    @Override
+    public HashMap<String, Object> toArray() {
+        return null;
+    }
 }